# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1267893190 0
# Node ID bb8a13838ec34d581c49cf9a3c7b9540254d30cb
# Parent  7c6c2df6f9a260754887aa82f0ecc1f4d5a2e4db# Parent  39e57b94118478bc9142849fdbc1a7daaf0fe15f
propagate from branch 'im.pidgin.pidgin' (head 7c6c2df6f9a260754887aa82f0ecc1f4d5a2e4db)
            to branch 'im.pidgin.cpw.rekkanoryo.ggupdate' (head 39e57b94118478bc9142849fdbc1a7daaf0fe15f)

diff -r 7c6c2df6f9a2 -r bb8a13838ec3 configure.ac
--- a/configure.ac	Fri Mar 05 22:21:04 2010 +0000
+++ b/configure.ac	Sat Mar 06 16:33:10 2010 +0000
@@ -2607,6 +2607,7 @@
 echo Build with Cyrus SASL support. : $enable_cyrus_sasl
 echo Use kerberos 4 with zephyr.... : $kerberos
 echo Use external libzephyr........ : $zephyr
+echo Use external libgadu.......... : $gadu_libs
 echo Install pixmaps............... : $enable_pixmaps
 echo Install translations.......... : $enable_i18n
 echo Has you....................... : yes
diff -r 7c6c2df6f9a2 -r bb8a13838ec3 libpurple/protocols/gg/Makefile.am
--- a/libpurple/protocols/gg/Makefile.am	Fri Mar 05 22:21:04 2010 +0000
+++ b/libpurple/protocols/gg/Makefile.am	Sat Mar 06 16:33:10 2010 +0000
@@ -4,14 +4,19 @@
 	lib/compat.h \
 	lib/COPYING \
 	lib/dcc.c \
+	lib/dcc7.c \
 	lib/events.c \
 	lib/http.c \
 	lib/libgadu.c \
 	lib/libgadu-config.h \
 	lib/libgadu.h \
 	lib/obsolete.c \
+	lib/protocol.h \
+	lib/pubdir.c \
 	lib/pubdir50.c \
-	lib/pubdir.c
+	lib/resolver.c \
+	lib/resolver.h \
+	lib/sha1.c
 
 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
@@ -20,16 +25,21 @@
 	lib/common.c \
 	lib/compat.h \
 	lib/dcc.c \
+	lib/dcc7.c \
 	lib/events.c \
 	lib/http.c \
 	lib/libgadu.c \
 	lib/libgadu-config.h \
 	lib/libgadu.h \
 	lib/obsolete.c \
+	lib/protocol.h \
+	lib/pubdir.c \
 	lib/pubdir50.c \
-	lib/pubdir.c
+	lib/resolver.c \
+	lib/resolver.h \
+	lib/sha1.c
 
-INTGG_CFLAGS = -I$(top_srcdir)/libpurple/protocols/gg/lib
+INTGG_CFLAGS = -I$(top_srcdir)/libpurple/protocols/gg/lib -DGG_IGNORE_DEPRECATED
 endif
 
 GGSOURCES = \
diff -r 7c6c2df6f9a2 -r bb8a13838ec3 libpurple/protocols/gg/Makefile.mingw
--- a/libpurple/protocols/gg/Makefile.mingw	Fri Mar 05 22:21:04 2010 +0000
+++ b/libpurple/protocols/gg/Makefile.mingw	Sat Mar 06 16:33:10 2010 +0000
@@ -8,7 +8,7 @@
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = libgg
-CFLAGS += -include win32dep.h
+CFLAGS += -include win32dep.h -DGG_IGNORE_DEPRECATED
 TYPE = PLUGIN
 
 # Static or Plugin...
@@ -41,12 +41,15 @@
 ##
 C_SRC =	\
 	lib/common.c \
+	lib/dcc.c \
+	lib/dcc7.c \
 	lib/events.c \
 	lib/http.c \
 	lib/libgadu.c \
 	lib/obsolete.c \
 	lib/pubdir.c \
 	lib/pubdir50.c \
+	lib/resolver.c \
 	buddylist.c \
 	confer.c \
 	gg.c \
diff -r 7c6c2df6f9a2 -r bb8a13838ec3 libpurple/protocols/gg/lib/common.c
--- a/libpurple/protocols/gg/lib/common.c	Fri Mar 05 22:21:04 2010 +0000
+++ b/libpurple/protocols/gg/lib/common.c	Sat Mar 06 16:33:10 2010 +0000
@@ -1,8 +1,8 @@
-/* $Id: common.c 16856 2006-08-19 01:13:25Z evands $ */
+/* $Id: common.c 878 2009-11-16 23:48:19Z wojtekka $ */
 
 /*
  *  (C) Copyright 2001-2002 Wojtek Kaniewski <wojtekka@irc.pl>