# HG changeset patch # User Elliott Sales de Andrade # Date 1251248973 0 # Node ID 572073acf8e79d1b79061de2710466a26fe317f3 # Parent b357216b7b79c9ce102df240c389dbb5c7930eed I think this was the optimization they wanted when this first broke. diff -r b357216b7b79 -r 572073acf8e7 pidgin/gtkblist.c --- a/pidgin/gtkblist.c Tue Aug 25 16:38:18 2009 +0000 +++ b/pidgin/gtkblist.c Wed Aug 26 01:09:33 2009 +0000 @@ -496,12 +496,17 @@ for (tmp = merges; tmp; tmp = tmp->next) { PurpleBlistNode *node = tmp->data; PurpleBlistNode *b; + PurpleBlistNodeType type; int i = 0; - if (purple_blist_node_get_type(node) == PURPLE_BLIST_BUDDY_NODE) + type = purple_blist_node_get_type(node); + + if (type == PURPLE_BLIST_BUDDY_NODE) { node = purple_blist_node_get_parent(node); - - if (purple_blist_node_get_type(node) != PURPLE_BLIST_CONTACT_NODE) + type = purple_blist_node_get_type(node); + } + + if (type != PURPLE_BLIST_CONTACT_NODE) continue; for (b = purple_blist_node_get_first_child(node);