# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1220285837 0
# Node ID 1b882e539c40d0e3d13d3903000c2487957a8c48
# Parent  b3de98d0ba95f0df6ed33ca5182074713cb33e08# Parent  20846036cbd5662a6420974acdfa17c24ceb5bb6
merge of 'aafdb65286c235642b3ed1ac877f14714653e6cb'
     and 'cbfe9639dab88cdedd221e9ad73b0fe9c533d80c'

diff -r b3de98d0ba95 -r 1b882e539c40 finch/plugins/Makefile.am
--- a/finch/plugins/Makefile.am	Mon Sep 01 15:01:33 2008 +0000
+++ b/finch/plugins/Makefile.am	Mon Sep 01 16:17:17 2008 +0000
@@ -52,7 +52,7 @@
 #
 SUFFIXES = .c .so
 .c.so:
-	$(LIBTOOL) --mode=compile $(CC) -DHAVE_CONFIG_H -I$(top_srcdir) $(AM_CPPFLAGS) $(CFLAGS) -c $< -o tmp$@.lo $(PLUGIN_CFLAGS)
+	$(LIBTOOL) --mode=compile $(CC) -DHAVE_CONFIG_H -I$(top_builddir) $(AM_CPPFLAGS) $(CFLAGS) -c $< -o tmp$@.lo $(PLUGIN_CFLAGS)
 	$(LIBTOOL) --mode=link    $(CC) $(CFLAGS) -o libtmp$@.la -rpath $(plugindir) tmp$@.lo $(LIBS) $(LDFLAGS) -module -avoid-version $(PLUGIN_LIBS)
 	@rm -f tmp$@.lo tmp$@.o libtmp$@.la
 	@cp .libs/libtmp$@.so* $@
diff -r b3de98d0ba95 -r 1b882e539c40 libpurple/plugins/Makefile.am
--- a/libpurple/plugins/Makefile.am	Mon Sep 01 15:01:33 2008 +0000
+++ b/libpurple/plugins/Makefile.am	Mon Sep 01 16:17:17 2008 +0000
@@ -150,7 +150,7 @@
 #
 SUFFIXES = .c .so
 .c.so:
-	$(LIBTOOL) --mode=compile $(CC) -DHAVE_CONFIG_H -I$(top_srcdir) $(AM_CPPFLAGS) $(CFLAGS) -c $< -o tmp$@.lo $(PLUGIN_CFLAGS)
+	$(LIBTOOL) --mode=compile $(CC) -DHAVE_CONFIG_H -I$(top_builddir) $(AM_CPPFLAGS) $(CFLAGS) -c $< -o tmp$@.lo $(PLUGIN_CFLAGS)
 	$(LIBTOOL) --mode=link    $(CC) $(CFLAGS) -o libtmp$@.la -rpath $(plugindir) tmp$@.lo $(LIBS) $(LDFLAGS) -module -avoid-version $(PLUGIN_LIBS)
 	@rm -f tmp$@.lo tmp$@.o libtmp$@.la
 	@cp .libs/libtmp$@.so* $@
diff -r b3de98d0ba95 -r 1b882e539c40 libpurple/protocols/oscar/libicq.c
--- a/libpurple/protocols/oscar/libicq.c	Mon Sep 01 15:01:33 2008 +0000
+++ b/libpurple/protocols/oscar/libicq.c	Mon Sep 01 16:17:17 2008 +0000
@@ -27,6 +27,15 @@
 
 #include "oscarcommon.h"
 
+static GHashTable *
+icq_get_account_text_table(PurpleAccount *account)
+{
+	GHashTable *table;
+	table = g_hash_table_new(g_str_hash, g_str_equal);
+	g_hash_table_insert(table, "login_label", (gpointer)_("ICQ UIN..."));
+	return table;
+}
+
 static PurplePluginProtocolInfo prpl_info =
 {
 	OPT_PROTO_MAIL_CHECK | OPT_PROTO_IM_IMAGE,
@@ -97,7 +106,7 @@
 	NULL,					/* get_attention_types */
 
 	sizeof(PurplePluginProtocolInfo),       /* struct_size */
-	NULL
+	icq_get_account_text_table, /* get_account_text_table */
 };
 
 static PurplePluginInfo info =
diff -r b3de98d0ba95 -r 1b882e539c40 libpurple/protocols/yahoo/yahoo.c
--- a/libpurple/protocols/yahoo/yahoo.c	Mon Sep 01 15:01:33 2008 +0000
+++ b/libpurple/protocols/yahoo/yahoo.c	Mon Sep 01 16:17:17 2008 +0000
@@ -4301,6 +4301,15 @@
 	return FALSE;
 }
 
+static GHashTable *
+yahoo_get_account_text_table(PurpleAccount *account)
+{
+	GHashTable *table;
+	table = g_hash_table_new(g_str_hash, g_str_equal);
+	g_hash_table_insert(table, "login_label", (gpointer)_("Yahoo ID..."));
+	return table;
+}
+
 static PurpleWhiteboardPrplOps yahoo_whiteboard_prpl_ops =
 {
 	yahoo_doodle_start,
@@ -4389,7 +4398,7 @@
 	yahoo_attention_types,
 
 	sizeof(PurplePluginProtocolInfo),       /* struct_size */
-	NULL
+	yahoo_get_account_text_table,    /* get_account_text_table */
 };
 
 static PurplePluginInfo info =
diff -r b3de98d0ba95 -r 1b882e539c40 pidgin/plugins/Makefile.am
--- a/pidgin/plugins/Makefile.am	Mon Sep 01 15:01:33 2008 +0000
+++ b/pidgin/plugins/Makefile.am	Mon Sep 01 16:17:17 2008 +0000
@@ -132,7 +132,7 @@
 #
 SUFFIXES = .c .so
 .c.so:
-	$(LIBTOOL) --mode=compile $(CC) -DHAVE_CONFIG_H -I$(top_srcdir) $(AM_CPPFLAGS) $(CFLAGS) -c $< -o tmp$@.lo $(PLUGIN_CFLAGS)
+	$(LIBTOOL) --mode=compile $(CC) -DHAVE_CONFIG_H -I$(top_builddir) $(AM_CPPFLAGS) $(CFLAGS) -c $< -o tmp$@.lo $(PLUGIN_CFLAGS)
 	$(LIBTOOL) --mode=link    $(CC) $(CFLAGS) -o libtmp$@.la -rpath $(plugindir) tmp$@.lo $(LIBS) $(LDFLAGS) -module -avoid-version $(PLUGIN_LIBS)
 	@rm -f tmp$@.lo tmp$@.o libtmp$@.la
 	@cp .libs/libtmp$@.so* $@