Mercurial > pidgin.yaz
comparison libpurple/blist.c @ 22317:6fc8f0c825e0
Kill off some uses of account->gc.
author | John Bailey <rekkanoryo@rekkanoryo.org> |
---|---|
date | Fri, 22 Feb 2008 00:11:25 +0000 |
parents | edca47ee06c5 |
children | 04dc38d726fb |
comparison
equal
deleted
inserted
replaced
22313:42724bd41274 | 22317:6fc8f0c825e0 |
---|---|
1586 | 1586 |
1587 if (!purple_find_buddy_in_group(b->account, b->name, g)) { | 1587 if (!purple_find_buddy_in_group(b->account, b->name, g)) { |
1588 hb->group = gnode; | 1588 hb->group = gnode; |
1589 g_hash_table_replace(purplebuddylist->buddies, hb, b); | 1589 g_hash_table_replace(purplebuddylist->buddies, hb, b); |
1590 | 1590 |
1591 if (b->account->gc) | 1591 if (purple_account_get_connection(b->account)) |
1592 serv_move_buddy(b, (PurpleGroup *)cnode->parent, g); | 1592 serv_move_buddy(b, (PurpleGroup *)cnode->parent, g); |
1593 } else { | 1593 } else { |
1594 gboolean empty_contact = FALSE; | 1594 gboolean empty_contact = FALSE; |
1595 | 1595 |
1596 /* this buddy already exists in the group, so we're | 1596 /* this buddy already exists in the group, so we're |
1597 * gonna delete it instead */ | 1597 * gonna delete it instead */ |
1598 g_free(hb->name); | 1598 g_free(hb->name); |
1599 g_free(hb); | 1599 g_free(hb); |
1600 if (b->account->gc) | 1600 if (purple_account_get_connection(b->account)) |
1601 purple_account_remove_buddy(b->account, b, (PurpleGroup *)cnode->parent); | 1601 purple_account_remove_buddy(b->account, b, (PurpleGroup *)cnode->parent); |
1602 | 1602 |
1603 if (!cnode->child->next) | 1603 if (!cnode->child->next) |
1604 empty_contact = TRUE; | 1604 empty_contact = TRUE; |
1605 purple_blist_remove_buddy(b); | 1605 purple_blist_remove_buddy(b); |
2085 return chat->alias; | 2085 return chat->alias; |
2086 | 2086 |
2087 prpl = purple_find_prpl(purple_account_get_protocol_id(chat->account)); | 2087 prpl = purple_find_prpl(purple_account_get_protocol_id(chat->account)); |
2088 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl); | 2088 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl); |
2089 | 2089 |
2090 parts = prpl_info->chat_info(chat->account->gc); | 2090 parts = prpl_info->chat_info(purple_account_get_connection(chat->account)); |
2091 pce = parts->data; | 2091 pce = parts->data; |
2092 ret = g_hash_table_lookup(chat->components, pce->identifier); | 2092 ret = g_hash_table_lookup(chat->components, pce->identifier); |
2093 g_list_foreach(parts, (GFunc)g_free, NULL); | 2093 g_list_foreach(parts, (GFunc)g_free, NULL); |
2094 g_list_free(parts); | 2094 g_list_free(parts); |
2095 | 2095 |