soc.2012.gg: 04dd9b27: Gadu-Gadu: synchronize internal libgadu ...

[tomkiewicz at cpw.pidgin.im]

----------------------------------------------------------------------
Revision: 04dd9b27f1bb9e7ef162fb6243e8c9e896b57f16
Parent:   7e7ded95fce2925f90c076c274edad16084b5032
Author:   tomkiewicz at cpw.pidgin.im
Date:     05/25/12 15:05:26
Branch:   im.pidgin.soc.2012.gg
URL: http://d.pidgin.im/viewmtn/revision/info/04dd9b27f1bb9e7ef162fb6243e8c9e896b57f16

Changelog: 

Gadu-Gadu: synchronize internal libgadu with upstream - part 4. Adds -Wall -Wextra -Werror switches. Refs #343

Changes against parent 7e7ded95fce2925f90c076c274edad16084b5032

  renamed  libpurple/protocols/gg/lib/libgadu-config.h
       to  libpurple/protocols/gg/lib/config.h
  renamed  libpurple/protocols/gg/lib/libgadu-debug.h
       to  libpurple/protocols/gg/lib/debug.h
  renamed  libpurple/protocols/gg/lib/libgadu-internal.h
       to  libpurple/protocols/gg/lib/internal.h
  patched  libpurple/protocols/gg/Makefile.am
  patched  libpurple/protocols/gg/lib/config.h
  patched  libpurple/protocols/gg/lib/dcc7.c
  patched  libpurple/protocols/gg/lib/debug.c
  patched  libpurple/protocols/gg/lib/events.c
  patched  libpurple/protocols/gg/lib/handlers.c
  patched  libpurple/protocols/gg/lib/libgadu.c
  patched  libpurple/protocols/gg/lib/libgadu.h
  patched  libpurple/protocols/gg/lib/obsolete.c
  patched  libpurple/protocols/gg/lib/pubdir50.c

-------------- next part --------------
============================================================
--- libpurple/protocols/gg/Makefile.am	055399a717b226355a566bf0361871637cefec72
+++ libpurple/protocols/gg/Makefile.am	52056a4431bbd8d71e1e3c3b26a4183e10f4886d
@@ -17,9 +17,9 @@ EXTRA_DIST = \
 	lib/http.c \
 	lib/libgadu.h \
 	lib/libgadu.c \
-	lib/libgadu-config.h \
-	lib/libgadu-debug.h \
-	lib/libgadu-internal.h \
+	lib/config.h \
+	lib/debug.h \
+	lib/internal.h \
 	lib/message.c \
 	lib/message.h \
 	lib/obsolete.c \
@@ -49,8 +49,8 @@ INTGGSOURCES = \
 	lib/http.c \
 	lib/libgadu.h \
 	lib/libgadu.c \
-	lib/libgadu-config.h \
-	lib/libgadu-internal.h \
+	lib/config.h \
+	lib/internal.h \
 	lib/message.c \
 	lib/message.h \
 	lib/obsolete.c \
@@ -105,6 +105,7 @@ AM_CPPFLAGS = \
 endif
 
 AM_CPPFLAGS = \
+	-Wall -Wextra -Werror \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
 	$(INTGG_CFLAGS) \
============================================================
--- libpurple/protocols/gg/lib/events.c	ddeb1042e5bf21cd3c886d92fbddf4f7e7339dbb
+++ libpurple/protocols/gg/lib/events.c	6497cfa187ec6d0a8257fbb4af157a157ec84565
@@ -33,9 +33,9 @@
 #include "compat.h"
 #include "libgadu.h"
 #include "protocol.h"
-#include "libgadu-internal.h"
+#include "internal.h"
 #include "encoding.h"
-#include "libgadu-debug.h"
+#include "debug.h"
 #include "session.h"
 
 #include <errno.h>
============================================================
--- libpurple/protocols/gg/lib/libgadu-config.h	6fd391496e380baa14a305ae20686fa0ff39f83c
+++ libpurple/protocols/gg/lib/config.h	ad2b6feca386b32e4e9d179ac97da5eb7142c473
@@ -1,6 +1,7 @@
 /* Local libgadu configuration. */
 
-#include "config.h"
+/* libpurple's config */
+#include <config.h>
 
 #ifndef __GG_LIBGADU_CONFIG_H
 #define __GG_LIBGADU_CONFIG_H
============================================================
--- libpurple/protocols/gg/lib/libgadu.c	8e5f5be394259b7663c0e0dbf55af293b3d5abc2
+++ libpurple/protocols/gg/lib/libgadu.c	660938af19e11f9bb0dd80e098c2f439736df3fc
@@ -37,9 +37,9 @@
 #include "libgadu.h"
 #include "protocol.h"
 #include "resolver.h"
-#include "libgadu-internal.h"
+#include "internal.h"
 #include "encoding.h"
-#include "libgadu-debug.h"
+#include "debug.h"
 #include "session.h"
 #include "message.h"
 #include "deflate.h"
============================================================
--- libpurple/protocols/gg/lib/libgadu.h	156dccaab9aae4d3f04bd5e002b78f09237e642b
+++ libpurple/protocols/gg/lib/libgadu.h	7424e08f2293c54abe966389daf25adaee979ef2
@@ -101,7 +101,7 @@ extern "C" {
 /* Defined if uintX_t types are defined in <sys/types.h>. */
 #undef GG_CONFIG_HAVE_SYS_TYPES_H
 
-#include "libgadu-config.h"
+#include "config.h"
 
 #ifdef GG_CONFIG_HAVE_OPENSSL
 #include <openssl/ssl.h>
============================================================
--- libpurple/protocols/gg/lib/obsolete.c	b42b09a62dd26972bafcd0aaeb33bfa422b578cb
+++ libpurple/protocols/gg/lib/obsolete.c	69eda65fdfce788b72918002b49e7851f443e7b2
@@ -34,7 +34,7 @@
 #include <errno.h>
 
 #include "libgadu.h"
-#include "libgadu-internal.h"
+#include "internal.h"
 
 struct gg_http *gg_userlist_get(uin_t uin, const char *passwd, int async)
 {
============================================================
--- libpurple/protocols/gg/lib/pubdir50.c	ec44588e0c8e9cac3045672349fa6feed6d30f0d
+++ libpurple/protocols/gg/lib/pubdir50.c	8a0725fb633db126d874c61e7bd7f18bfff7ca31
@@ -31,7 +31,7 @@
 #include <time.h>
 
 #include "libgadu.h"
-#include "libgadu-internal.h"
+#include "internal.h"
 #include "encoding.h"
 
 /**
============================================================
--- libpurple/protocols/gg/lib/dcc7.c	06f1ac15d74499da48fb2ab0181978c5c45dc16e
+++ libpurple/protocols/gg/lib/dcc7.c	c4c888d41e46c590a51ad1ee83ae7248e7e64eac
@@ -49,8 +49,8 @@
 #include "libgadu.h"
 #include "protocol.h"
 #include "resolver.h"
-#include "libgadu-internal.h"
-#include "libgadu-debug.h"
+#include "internal.h"
+#include "debug.h"
 
 #define gg_debug_dcc(dcc, level, fmt...) \
 	gg_debug_session(((dcc) != NULL) ? (dcc)->sess : NULL, level, fmt)
============================================================
--- libpurple/protocols/gg/lib/debug.c	9a87a0e803fcd57337fce35be982651ecbd8c6a1
+++ libpurple/protocols/gg/lib/debug.c	5a00ccd3c331e38717212416d4a495204f065e14
@@ -32,7 +32,7 @@
 #include <string.h>
 
 #include "libgadu.h"
-#include "libgadu-debug.h"
+#include "debug.h"
 
 /**
  * Poziom rejestracji informacji odpluskwiaj?cych. Zmienna jest mask? bitow?
============================================================
--- libpurple/protocols/gg/lib/handlers.c	3d0c7b4c5928d70f70f5675d6976ed0684189faf
+++ libpurple/protocols/gg/lib/handlers.c	d980f41692a3390da8f58abb9207b248bedc4eb8
@@ -39,7 +39,7 @@
 #include "protocol.h"
 #include "encoding.h"
 #include "message.h"
-#include "libgadu-internal.h"
+#include "internal.h"
 #include "deflate.h"
 
 #include <errno.h>