propagate from branch 'im.pidgin.pidgin' (head 7c6c2df6f9a260754887aa82f0ecc1f4d5a2e4db) cpw.rekkanoryo.ggupdate

Sat, 06 Mar 2010 16:33:10 +0000

author
John Bailey <rekkanoryo@rekkanoryo.org>
date
Sat, 06 Mar 2010 16:33:10 +0000
branch
cpw.rekkanoryo.ggupdate
changeset 29823
bb8a13838ec3
parent 29822
7c6c2df6f9a2 (current diff)
parent 29802
39e57b941184 (diff)
child 29824
9878119b5d78

propagate from branch 'im.pidgin.pidgin' (head 7c6c2df6f9a260754887aa82f0ecc1f4d5a2e4db)
to branch 'im.pidgin.cpw.rekkanoryo.ggupdate' (head 39e57b94118478bc9142849fdbc1a7daaf0fe15f)

configure.ac file | annotate | diff | comparison | revisions
--- 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
--- 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 \