Mercurial > pidgin
diff finch/gntconv.c @ 25859:103d0d6ffab6
propagate from branch 'im.pidgin.pidgin' (head 1cad4b015e35541ea834da220d2b814b5d5739fb)
to branch 'im.pidgin.pidgin.next.minor' (head ee8cbf9dcaea5349c8f63742fd6b5f7134345c0e)
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Mon, 01 Dec 2008 17:05:40 +0000 |
| parents | 0e08c847517d |
| children | 15ae2dea92b3 |
line wrap: on
line diff
--- a/finch/gntconv.c Mon Dec 01 17:05:35 2008 +0000 +++ b/finch/gntconv.c Mon Dec 01 17:05:40 2008 +0000 @@ -496,8 +496,9 @@ buddies = purple_find_buddies(account, name); for (cur = buddies; cur != NULL; cur = cur->next) { PurpleBlistNode *node = cur->data; - if ((node != NULL) && ((node->prev != NULL) || (node->next != NULL))) { - finch_log_show_contact((PurpleContact *)node->parent); + if ((node != NULL) && + (purple_blist_node_get_sibling_prev(node) || purple_blist_node_get_sibling_next(node))) { + finch_log_show_contact((PurpleContact *)purple_blist_node_get_parent(node)); g_slist_free(buddies); return; } @@ -529,7 +530,7 @@ gnt_menuitem_set_submenu(item, GNT_MENU(sub)); for (; buds; buds = g_slist_delete_link(buds, buds)) { - PurpleBlistNode *node = (PurpleBlistNode *)purple_buddy_get_contact((PurpleBuddy *)buds->data); + PurpleBlistNode *node = PURPLE_BLIST_NODE(purple_buddy_get_contact(PURPLE_BUDDY(buds->data))); for (node = purple_blist_node_get_first_child(node); node != NULL; node = purple_blist_node_get_sibling_next(node)) { PurpleBuddy *buddy = (PurpleBuddy *)node;