pidgin: 0e7cdec8: Gadu-Gadu: Add encrypted (SSL) connectio...

[rekkanoryo at pidgin.im]

----------------------------------------------------------------------
Revision: 0e7cdec888643c43ad219ca4f764fe142b9beea3
Parent:   3c6138e8de4359530c9a5bde39b23349f754281c
Author:   tomkiewicz at o2.pl
Date:     04/06/11 21:49:57
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/0e7cdec888643c43ad219ca4f764fe142b9beea3

Changelog: 

Gadu-Gadu: Add encrypted (SSL) connection support for GNUTLS users.
Fixes #13613.

Changes against parent 3c6138e8de4359530c9a5bde39b23349f754281c

  patched  libpurple/protocols/gg/Makefile.am
  patched  libpurple/protocols/gg/gg.c
  patched  libpurple/protocols/gg/lib/libgadu.h

-------------- next part --------------
============================================================
--- libpurple/protocols/gg/Makefile.am	18d7f2f7430c1f734ed9e3e70c6e566ece824dbb
+++ libpurple/protocols/gg/Makefile.am	6d0f5a8f4326c56aebd1ed9b880893af58473fe1
@@ -56,9 +56,15 @@ INTGGSOURCES = \
 	lib/session.h \
 	lib/sha1.c
 
-INTGG_CFLAGS = -I$(top_srcdir)/libpurple/protocols/gg/lib -DGG_IGNORE_DEPRECATED
+INTGG_CFLAGS = -I$(top_srcdir)/libpurple/protocols/gg/lib -DGG_IGNORE_DEPRECATED -DUSE_INTERNAL_LIBGADU
+
+if USE_GNUTLS
+INTGG_CFLAGS += -DUSE_GNUTLS
+GADU_LIBS += $(GNUTLS_LIBS)
 endif
 
+endif
+
 GGSOURCES = \
 	$(INTGGSOURCES) \
 	gg-utils.h \
============================================================
--- libpurple/protocols/gg/gg.c	b1a5c5902afeb2c68471212fd94fe6705dd135ac
+++ libpurple/protocols/gg/gg.c	227d07f52880b8dd1f8af374455ca44a67c7c6a0
@@ -2041,7 +2041,12 @@ static void ggp_login(PurpleAccount *acc
 
 	glp->async = 1;
 	glp->status = ggp_to_gg_status(status, &glp->status_descr);
+#if defined(USE_GNUTLS) || !defined(USE_INTERNAL_LIBGADU)
+	glp->tls = 1;
+#else
 	glp->tls = 0;
+#endif
+	purple_debug_info("gg", "TLS enabled: %d\n", glp->tls);
 
 	if (!info->status_broadcasting)
 		glp->status = glp->status|GG_STATUS_FRIENDS_MASK;
============================================================
--- libpurple/protocols/gg/lib/libgadu.h	c5f014c1b825c4c33452c7a9ea69b2bea823f81a
+++ libpurple/protocols/gg/lib/libgadu.h	97bf09c52648c7690b85f4416e52905086ef2356
@@ -72,7 +72,11 @@ extern "C" {
 #undef GG_CONFIG_HAVE_LONG_LONG
 
 /* Defined if libgadu was compiled and linked with GnuTLS support. */
-#undef GG_CONFIG_HAVE_GNUTLS
+#ifdef USE_GNUTLS
+#	define GG_CONFIG_HAVE_GNUTLS
+#else
+#	undef GG_CONFIG_HAVE_GNUTLS
+#endif
 
 /* Defined if libgadu was compiled and linked with OpenSSL support. */
 #undef GG_CONFIG_HAVE_OPENSSL