# HG changeset patch # User Paul Aurich # Date 1251180983 0 # Node ID 6773ee1f50742e7d51891ce3e9cedb46318c48c4 # Parent 14e79bd71ac3c6dd077a7bcb2a6a9a825970e135 Fix the auto-personize stuff. Closes #9948. diff -r 14e79bd71ac3 -r 6773ee1f5074 ChangeLog --- a/ChangeLog Tue Aug 25 03:54:33 2009 +0000 +++ b/ChangeLog Tue Aug 25 06:16:23 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 14e79bd71ac3 -r 6773ee1f5074 pidgin/gtkblist.c --- a/pidgin/gtkblist.c Tue Aug 25 03:54:33 2009 +0000 +++ b/pidgin/gtkblist.c Tue Aug 25 06:16:23 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);