Don't use GnuTLS, if it's disabled. Fixes #16431 release-2.x.y

Tue, 04 Nov 2014 21:37:38 +0100

author
Tomasz Wasilczyk <twasilczyk@pidgin.im>
date
Tue, 04 Nov 2014 21:37:38 +0100
branch
release-2.x.y
changeset 36218
ca3ea8900dc9
parent 36217
c05804b2619a
child 36219
703e982d8d18

Don't use GnuTLS, if it's disabled. Fixes #16431

ChangeLog file | annotate | diff | comparison | revisions
libpurple/protocols/gg/lib/config.h file | annotate | diff | comparison | revisions
--- a/ChangeLog	Mon Nov 03 11:25:23 2014 -0600
+++ b/ChangeLog	Tue Nov 04 21:37:38 2014 +0100
@@ -1,6 +1,10 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.10.11 (?/?/?):
+	Gadu-Gadu:
+	* Fix a bug that prevented plugin to load when compiled without GnuTLS.
+	  (mancha) (#16431)
+
 	General:
 	* Fix handling of Self-Signed SSL/TLS Certificates when using the NSS
           plugin (#16412)
--- a/libpurple/protocols/gg/lib/config.h	Mon Nov 03 11:25:23 2014 -0600
+++ b/libpurple/protocols/gg/lib/config.h	Tue Nov 04 21:37:38 2014 +0100
@@ -49,7 +49,7 @@
 
 /* Defined if libgadu was compiled and linked with GnuTLS support. */
 #undef GG_CONFIG_HAVE_GNUTLS
-#ifdef HAVE_GNUTLS_2_10
+#if defined(HAVE_GNUTLS) && defined(HAVE_GNUTLS_2_10)
 #  define GG_CONFIG_HAVE_GNUTLS
 #endif
 

mercurial