# HG changeset patch # User Sadrul Habib Chowdhury # Date 1225547305 0 # Node ID 53c27ca1bb71e7421c89323c12c6272f93152124 # Parent 8aa7d8bcbc7dc40e37cfeaf0ef248c16ba96d193 Struct hiding for Finch. PurpleChat:alias and PurpleContact:totalsize are still used. diff -r 8aa7d8bcbc7d -r 53c27ca1bb71 finch/gntblist.c --- a/finch/gntblist.c Fri Oct 31 21:06:26 2008 +0000 +++ b/finch/gntblist.c Sat Nov 01 13:48:25 2008 +0000 @@ -1438,16 +1438,16 @@ if (PURPLE_BLIST_NODE_IS_BUDDY(node)) { PurpleBuddy *b = (PurpleBuddy*) node; type = PURPLE_LOG_IM; - name = g_strdup(b->name); - account = b->account; + name = g_strdup(purple_buddy_get_name(b)); + account = purple_buddy_get_account(b); } else if (PURPLE_BLIST_NODE_IS_CHAT(node)) { PurpleChat *c = (PurpleChat*) node; PurplePluginProtocolInfo *prpl_info = NULL; type = PURPLE_LOG_CHAT; - account = c->account; + account = purple_chat_get_account(c); prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_find_prpl(purple_account_get_protocol_id(account))); if (prpl_info && prpl_info->get_chat_name) { - name = prpl_info->get_chat_name(c->components); + name = prpl_info->get_chat_name(purple_chat_get_components(c)); } } else if (PURPLE_BLIST_NODE_IS_CONTACT(node)) { finch_log_show_contact((PurpleContact *)node); diff -r 8aa7d8bcbc7d -r 53c27ca1bb71 finch/gntconv.c --- a/finch/gntconv.c Fri Oct 31 21:06:26 2008 +0000 +++ b/finch/gntconv.c Sat Nov 01 13:48:25 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; } diff -r 8aa7d8bcbc7d -r 53c27ca1bb71 finch/gntlog.c --- a/finch/gntlog.c Fri Oct 31 21:06:26 2008 +0000 +++ b/finch/gntlog.c Sat Nov 01 13:48:25 2008 +0000 @@ -458,12 +458,16 @@ for (child = purple_blist_node_get_first_child((PurpleBlistNode*)contact); child; child = purple_blist_node_get_sibling_next(child)) { + const char *name; + PurpleAccount *account; if (!PURPLE_BLIST_NODE_IS_BUDDY(child)) continue; - logs = g_list_concat(purple_log_get_logs(PURPLE_LOG_IM, ((PurpleBuddy *)child)->name, - ((PurpleBuddy *)child)->account), logs); - total_log_size += purple_log_get_total_size(PURPLE_LOG_IM, ((PurpleBuddy *)child)->name, ((PurpleBuddy *)child)->account); + name = purple_buddy_get_name((PurpleBuddy *)child); + account = purple_buddy_get_account((PurpleBuddy *)child); + logs = g_list_concat(purple_log_get_logs(PURPLE_LOG_IM, name, + account), logs); + total_log_size += purple_log_get_total_size(PURPLE_LOG_IM, name, account); } logs = g_list_sort(logs, purple_log_compare);