Mercurial > pidgin
changeset 28094:a68f2782957a
merge of '1d360041ff45d34220efcda18bc92c70831b672f'
and '7bed935cd3432470394f51f4fe6e7f915aed9145'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Tue, 25 Aug 2009 06:17:37 +0000 |
| parents | 2da9e508a523 (diff) 36b5b0872f10 (current diff) |
| children | 0b3142f3edb4 |
| files | |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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);