# HG changeset patch
# User Bartoz Oler <bartosz@pidgin.im>
# Date 1141853119 0
# Node ID b03f19de58b8479ff7569e6be0d19deef21378ca
# Parent  974fffde9f600485956dbaefbfcedafa608f4e94
[gaim-migrate @ 15840]
* Use GADU_CFLAGS when checking for compatibility of libgadu with the GPL.
* Try to display buddy's alias when asking user for a chatroom.
* Added myself to the Help->About dialog.

committer: Tailor Script <tailor@pidgin.im>

diff -r 974fffde9f60 -r b03f19de58b8 AUTHORS
--- a/AUTHORS	Wed Mar 08 21:13:37 2006 +0000
+++ b/AUTHORS	Wed Mar 08 21:25:19 2006 +0000
@@ -23,6 +23,7 @@
 Gary 'grim' Kramlich - Developer
 Richard 'rlaager' Laager
 Christopher 'siege' O'Brien - Developer
+Bartosz Oler - Developer
 Etan 'deryni' Reisner - Developer
 Tim 'marv' Ringenbach - Developer
 Luke 'LSchiere' Schierer - Support
diff -r 974fffde9f60 -r b03f19de58b8 configure.ac
--- a/configure.ac	Wed Mar 08 21:13:37 2006 +0000
+++ b/configure.ac	Wed Mar 08 21:25:19 2006 +0000
@@ -317,6 +317,8 @@
 
 if test "x$gadu_libs" = "xyes"; then
 	AC_MSG_CHECKING(for libgadu GPL compatibility)
+	CPPFLAGS_save="$CPPFLAGS"
+	CPPFLAGS="$CPPFLAGS $GADU_CFLAGS"
 	AC_TRY_COMPILE([#include <libgadu.h>], [
 #ifdef __GG_LIBGADU_HAVE_OPENSSL
 #error "libgadu is not compatible with the GPL when compiled with OpenSSL support."
@@ -339,6 +341,7 @@
 		GADU_CFLAGS=""
 		gadu_libs=no
 	])
+	CPPFLAGS="$CPPFLAGS_save"
 fi
 
 AC_SUBST(GADU_LIBS)
diff -r 974fffde9f60 -r b03f19de58b8 src/gtkdialogs.c
--- a/src/gtkdialogs.c	Wed Mar 08 21:13:37 2006 +0000
+++ b/src/gtkdialogs.c	Wed Mar 08 21:25:19 2006 +0000
@@ -67,6 +67,7 @@
 	{"Gary 'grim' Kramlich",		N_("developer"), NULL},
 	{"Richard 'rlaager' Laager",	N_("developer"), NULL},
 	{"Christopher 'siege' O'Brien", N_("developer"), "taliesein@users.sf.net"},
+	{"Bartosz Oler",		N_("developer"), NULL},
 	{"Etan 'deryni' Reisner",       N_("developer"), NULL},
 	{"Tim 'marv' Ringenbach",		N_("developer"), NULL},
 	{"Luke 'LSchiere' Schierer",	N_("support"), "lschiere@users.sf.net"},
diff -r 974fffde9f60 -r b03f19de58b8 src/protocols/gg/gg.c
--- a/src/protocols/gg/gg.c	Wed Mar 08 21:13:37 2006 +0000
+++ b/src/protocols/gg/gg.c	Wed Mar 08 21:25:19 2006 +0000
@@ -800,9 +800,8 @@
 	}
 	gaim_request_field_group_add_field(group, field);
 
-	/* TODO: s/screenname/alias/ */
 	msg = g_strdup_printf(_("Select a chat for buddy: %s"),
-			      gaim_buddy_get_name(buddy));
+			      gaim_buddy_get_alias(buddy));
 	gaim_request_fields(gc,
 			_("Add to chat..."),
 			_("Add to chat..."),