# HG changeset patch
# User maiku@pidgin.im
# Date 1251193058 0
# Node ID 0b3142f3edb4a8f74d32547659e7ad55aac45e3c
# Parent  0775b7b7298ebba45fa5e89a8c6b71a5315cedf1# Parent  a68f2782957a0b30e8d5877d50f2652bf6a0dbac
merge of '6a17707ef96a5fb4dde26e6700ad3e0d39c40561'
     and 'cf52f515f41f2668c92606c9ad852fb55460da9c'

diff -r 0775b7b7298e -r 0b3142f3edb4 ChangeLog
--- a/ChangeLog	Tue Aug 25 09:37:28 2009 +0000
+++ b/ChangeLog	Tue Aug 25 09:37:38 2009 +0000
@@ -17,6 +17,9 @@
 	Finch:
 	* Properly detect libpanel on OpenBSD.  (Brad Smith)
 
+	Pidgin:
+	* Fix the auto-personize functionality in the Buddy List.
+
 version 2.6.1 (08/18/2009):
 	* Fix a crash when some users send you a link in a Yahoo IM
 	* Fix compilation with GTK+ < 2.6.0
diff -r 0775b7b7298e -r 0b3142f3edb4 libpurple/account.c
--- a/libpurple/account.c	Tue Aug 25 09:37:28 2009 +0000
+++ b/libpurple/account.c	Tue Aug 25 09:37:38 2009 +0000
@@ -1206,11 +1206,14 @@
 purple_account_disconnect(PurpleAccount *account)
 {
 	PurpleConnection *gc;
+	const char *username;
 
 	g_return_if_fail(account != NULL);
 	g_return_if_fail(!purple_account_is_disconnected(account));
 
-	purple_debug_info("account", "Disconnecting account %p\n", account);
+	username = purple_account_get_username(account);
+	purple_debug_info("account", "Disconnecting account %s (%p)\n",
+	                  username ? username : "(null)", account);
 
 	account->disconnecting = TRUE;
 
diff -r 0775b7b7298e -r 0b3142f3edb4 pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Tue Aug 25 09:37:28 2009 +0000
+++ b/pidgin/gtkblist.c	Tue Aug 25 09:37:38 2009 +0000
@@ -496,15 +496,12 @@
 	for (tmp = merges; tmp; tmp = tmp->next) {
 		PurpleBlistNode *node = tmp->data;
 		PurpleBlistNode *b;
-		PurpleBlistNodeType type;
 		int i = 0;
 
-		type = purple_blist_node_get_type(node);
-
-		if(type == PURPLE_BLIST_BUDDY_NODE)
+		if (purple_blist_node_get_type(node) == PURPLE_BLIST_BUDDY_NODE)
 			node = purple_blist_node_get_parent(node);
 
-		if(type == PURPLE_BLIST_CONTACT_NODE)
+		if (purple_blist_node_get_type(node) != PURPLE_BLIST_CONTACT_NODE)
 			continue;
 
 		for (b = purple_blist_node_get_first_child(node);
diff -r 0775b7b7298e -r 0b3142f3edb4 pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c	Tue Aug 25 09:37:28 2009 +0000
+++ b/pidgin/gtkdialogs.c	Tue Aug 25 09:37:38 2009 +0000
@@ -476,9 +476,11 @@
 				" <A HREF=\"http://pidgin.im/cgi-bin/mailman/listinfo/support\">"
 				"mailing list</A>, and messages sent here are"
 				" <A HREF=\"http://pidgin.im/pipermail/support/\">publicly"
-				" archived!</A>  Furthermore, we do <I><B>not</B></I> support"
-				" MXit, Facebook, Skype, or any other third-party plugins on"
-				" this list.)<BR/><BR/>"));
+				" archived!</A>  Please note that this list's primary language"
+				" is English.  Posts in other languages may not receive answers"
+				" as complete or as helpful as those in English. Additionally,"
+				" we do <U><I><B>not</B></I></U> support MXit, Facebook, Skype,"
+				" or any other third-party plugins on this list.)<BR/><BR/>"));
 	g_string_append_printf(str, _("<FONT SIZE=\"4\">IRC Channel:</FONT> "
 				"#pidgin on irc.freenode.net<BR><BR>"));
 	g_string_append_printf(str, _("<FONT SIZE=\"4\">XMPP MUC:</FONT> "