Mercurial > pidgin.yaz
diff pidgin/gtkblist.c @ 29500:6e9917e067e6
propagate from branch 'im.pidgin.pidgin' (head f881ba77d0fe70224a938185a5a3675b39520873)
to branch 'im.pidgin.pidgin.next.minor' (head 91d04fec37b328ffc2e552ea14a5a520d27161f2)
| author | John Bailey <rekkanoryo@rekkanoryo.org> |
|---|---|
| date | Wed, 16 Sep 2009 15:41:33 +0000 |
| parents | 4da3415a8df6 0d9f5172ebc9 |
| children | eae4883944ed |
line wrap: on
line diff
--- a/pidgin/gtkblist.c Thu Sep 10 21:51:32 2009 +0000 +++ b/pidgin/gtkblist.c Wed Sep 16 15:41:33 2009 +0000 @@ -472,10 +472,12 @@ type = purple_blist_node_get_type(node); - if(type == PURPLE_BLIST_BUDDY_NODE) + if (type == PURPLE_BLIST_BUDDY_NODE) { node = purple_blist_node_get_parent(node); - - if(type == 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); @@ -6383,7 +6385,7 @@ gchar *mark, *tmp; const gchar *fg_color, *font; GdkColor *color = NULL; - PidginBlistTheme *theme = pidgin_blist_get_theme(); + PidginBlistTheme *theme; PidginThemeFont *pair; gboolean selected = (gtkblist->selected_node == cnode);