# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1251181057 0
# Node ID a68f2782957a0b30e8d5877d50f2652bf6a0dbac
# Parent  2da9e508a5233b794c3a69dcf572f6a44ddb7984# Parent  36b5b0872f10a48098a375b5f9058df6bca40424
merge of '1d360041ff45d34220efcda18bc92c70831b672f'
     and '7bed935cd3432470394f51f4fe6e7f915aed9145'

diff -r 36b5b0872f10 -r a68f2782957a ChangeLog
--- a/ChangeLog	Tue Aug 25 03:58:42 2009 +0000
+++ b/ChangeLog	Tue Aug 25 06:17:37 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 36b5b0872f10 -r a68f2782957a pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Tue Aug 25 03:58:42 2009 +0000
+++ b/pidgin/gtkblist.c	Tue Aug 25 06:17:37 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);