/pidgin/main: 03d1fa876658: Partially revert 34ff4ee99c48: don't...

[Tomasz Wasilczyk]

Changeset: 03d1fa87665877d32b21c1e0d72ce11675e0001f
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-01-07 22:55 +0100
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/03d1fa876658

Description:

Partially revert 34ff4ee99c48: don't link libgadu directly with Pidgin

diffstat:

 pidgin/Makefile.am  |  4 +---
 pidgin/gtkdialogs.c |  6 +-----
 2 files changed, 2 insertions(+), 8 deletions(-)

diffs (43 lines):

diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am
--- a/pidgin/Makefile.am
+++ b/pidgin/Makefile.am
@@ -181,7 +181,6 @@ pidgin_LDADD = \
 	$(WEBKIT_LIBS) \
 	$(GTK_LIBS) \
 	$(X11_LIBS) \
-	$(GADU_LIBS) \
 	$(top_builddir)/libpurple/libpurple.la
 
 AM_CPPFLAGS = \
@@ -204,7 +203,6 @@ AM_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
 	$(GTKSPELL_CFLAGS) \
 	$(LIBXML_CFLAGS) \
-	$(WEBKIT_CFLAGS) \
-	$(GADU_CFLAGS)
+	$(WEBKIT_CFLAGS)
 endif  # ENABLE_GTK
 
diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
@@ -48,10 +48,6 @@
 #include <gst/gst.h>
 #endif
 
-#ifdef HAVE_LIBGADU
-#include <libgadu.h>
-#endif
-
 #include "gtk3compat.h"
 
 static GList *dialogwindows = NULL;
@@ -646,7 +642,7 @@ void pidgin_dialogs_buildinfo(void)
 #if defined(USE_INTERNAL_LIBGADU)
 	g_string_append(str, "<dt>Gadu-Gadu library (libgadu):</dt><dd>Internal</dd>");
 #elif defined(HAVE_LIBGADU)
-	g_string_append_printf(str, "<dt>Gadu-Gadu library (libgadu):</dt><dd>%s</dd>", gg_libgadu_version());
+	g_string_append(str, "<dt>Gadu-Gadu library (libgadu):</dt><dd>External</dd>");
 #else
 	g_string_append(str, "<dt>Gadu-Gadu library (libgadu):</dt><dd>Disabled</dd>");
 #endif