From: <rl...@us...> - 2006-09-21 03:07:10
|
Revision: 17332 http://svn.sourceforge.net/gaim/?rev=17332&view=rev Author: rlaager Date: 2006-09-20 20:07:04 -0700 (Wed, 20 Sep 2006) Log Message: ----------- Update the Help dialog in the GTK+ UI to properly show that an internal libgadu is being used on !win32. Modified Paths: -------------- trunk/configure.ac trunk/gtk/Makefile.am trunk/gtk/gtkdialogs.c trunk/libgaim/protocols/gg/Makefile.am Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-09-20 20:32:43 UTC (rev 17331) +++ trunk/configure.ac 2006-09-21 03:07:04 UTC (rev 17332) @@ -652,7 +652,7 @@ CPPFLAGS="$CPPFLAGS_save" fi -AM_CONDITIONAL(USE_INTERNAL_LIBGG, test "x$gadu_libs" != "xyes") +AM_CONDITIONAL(USE_INTERNAL_LIBGADU, test "x$gadu_libs" != "xyes") AC_SUBST(GADU_LIBS) AC_SUBST(GADU_CFLAGS) Modified: trunk/gtk/Makefile.am =================================================================== --- trunk/gtk/Makefile.am 2006-09-20 20:32:43 UTC (rev 17331) +++ trunk/gtk/Makefile.am 2006-09-21 03:07:04 UTC (rev 17332) @@ -165,6 +165,10 @@ $(GTK_LIBS) \ $(top_builddir)/libgaim/libgaim.la +if USE_INTERNAL_LIBGADU +INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU +endif + AM_CPPFLAGS = \ -DBR_PTHREADS=0 \ -DDATADIR=\"$(datadir)\" \ @@ -179,5 +183,6 @@ $(DBUS_CFLAGS) \ $(GTKSPELL_CFLAGS) \ $(STARTUP_NOTIFICATION_CFLAGS) \ - $(LIBXML_CFLAGS) + $(LIBXML_CFLAGS) \ + $(INTGG_CFLAGS) endif # ENABLE_GTK Modified: trunk/gtk/gtkdialogs.c =================================================================== --- trunk/gtk/gtkdialogs.c 2006-09-20 20:32:43 UTC (rev 17331) +++ trunk/gtk/gtkdialogs.c 2006-09-21 03:07:04 UTC (rev 17332) @@ -497,15 +497,15 @@ #endif #endif -#ifdef HAVE_LIBGADU -#ifdef _WIN32 +#if defined(_WIN32) || defined(USE_INTERNAL_LIBGADU) g_string_append(str, " <b>Gadu-Gadu library (libgadu):</b> Internal<br/>"); #else +#ifdef HAVE_LIBGADU g_string_append(str, " <b>Gadu-Gadu library (libgadu):</b> Enabled<br/>"); -#endif #else g_string_append(str, " <b>Gadu-Gadu library (libgadu):</b> Disabled<br/>"); #endif +#endif #ifdef USE_GTKSPELL g_string_append(str, " <b>GtkSpell:</b> Enabled<br/>"); Modified: trunk/libgaim/protocols/gg/Makefile.am =================================================================== --- trunk/libgaim/protocols/gg/Makefile.am 2006-09-20 20:32:43 UTC (rev 17331) +++ trunk/libgaim/protocols/gg/Makefile.am 2006-09-21 03:07:04 UTC (rev 17332) @@ -27,7 +27,7 @@ gg.h \ gg.c -if USE_INTERNAL_LIBGG +if USE_INTERNAL_LIBGADU GGSOURCES += \ lib/common.c \ lib/compat.h \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |