# HG changeset patch
# User andrew.victor@mxit.com
# Date 1320088874 0
# Node ID 76096c42f558158109df31651b670020ad6c9b2c
# Parent 2fdc668362f08ab5ea8d40189e8012fc1f271047
Use the PurpleChat accessor functions.
diff -r 2fdc668362f0 -r 76096c42f558 pidgin/gtkblist.c
--- a/pidgin/gtkblist.c Mon Oct 31 19:00:39 2011 +0000
+++ b/pidgin/gtkblist.c Mon Oct 31 19:21:14 2011 +0000
@@ -1755,7 +1755,7 @@
pidgin_new_item_from_stock(menu, _("View _Log"), NULL,
G_CALLBACK(gtk_blist_menu_showlog_cb), node, 0, 0, NULL);
- pidgin_append_blist_node_proto_menu(menu, purple_account_get_connection(c->account), node);
+ pidgin_append_blist_node_proto_menu(menu, purple_account_get_connection(purple_chat_get_account(c)), node);
pidgin_append_blist_node_extended_menu(menu, node);
pidgin_separator(menu);
@@ -2874,7 +2874,7 @@
if (PURPLE_BLIST_NODE_IS_BUDDY(node)) {
account = purple_buddy_get_account((PurpleBuddy*)(node));
} else if (PURPLE_BLIST_NODE_IS_CHAT(node)) {
- account = ((PurpleChat*)(node))->account;
+ account = purple_chat_get_account((PurpleChat*)(node));
}
td->padding = TOOLTIP_BORDER;
@@ -3677,13 +3677,13 @@
PidginBlistNode *bnode = node->ui_data;
chat = (PurpleChat *)node;
- prpl = purple_find_prpl(purple_account_get_protocol_id(chat->account));
+ prpl = purple_find_prpl(purple_account_get_protocol_id(purple_chat_get_account(chat)));
prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
connections = purple_connections_get_all();
if (connections && connections->next)
{
- tmp = g_markup_escape_text(purple_account_get_username(chat->account), -1);
+ tmp = g_markup_escape_text(purple_account_get_username(purple_chat_get_account(chat)), -1);
g_string_append_printf(str, _("Account: %s"), tmp);
g_free(tmp);
}
@@ -3693,12 +3693,12 @@
} else {
char *chat_name;
if (prpl_info && prpl_info->get_chat_name)
- chat_name = prpl_info->get_chat_name(chat->components);
+ chat_name = prpl_info->get_chat_name(purple_chat_get_components(chat));
else
chat_name = g_strdup(purple_chat_get_name(chat));
conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, chat_name,
- chat->account);
+ purple_chat_get_account(chat));
g_free(chat_name);
}
@@ -3715,7 +3715,7 @@
}
if (prpl_info && prpl_info->chat_info != NULL)
- cur = prpl_info->chat_info(purple_account_get_connection(chat->account));
+ cur = prpl_info->chat_info(purple_account_get_connection(purple_chat_get_account(chat)));
else
cur = NULL;
@@ -3724,13 +3724,13 @@
pce = cur->data;
if (!pce->secret && (!pce->required &&
- g_hash_table_lookup(chat->components, pce->identifier) == NULL))
+ g_hash_table_lookup(purple_chat_get_components(chat), pce->identifier) == NULL))
{
tmp = purple_text_strip_mnemonic(pce->label);
name = g_markup_escape_text(tmp, -1);
g_free(tmp);
value = g_markup_escape_text(g_hash_table_lookup(
- chat->components, pce->identifier), -1);
+ purple_chat_get_components(chat), pce->identifier), -1);
g_string_append_printf(str, "\n%s %s",
name ? name : "",
value ? value : "");
@@ -4099,7 +4099,7 @@
if(buddy)
account = purple_buddy_get_account(buddy);
else
- account = chat->account;
+ account = purple_chat_get_account(chat);
prpl = purple_find_prpl(purple_account_get_protocol_id(account));
if(!prpl)
@@ -6706,7 +6706,7 @@
chat = (PurpleChat*)node;
- if(purple_account_is_connected(chat->account)) {
+ if(purple_account_is_connected(purple_chat_get_account(chat))) {
GtkTreeIter iter;
GdkPixbuf *status, *avatar, *emblem, *prpl_icon;
const gchar *color, *font;
@@ -6770,7 +6770,7 @@
g_free(mark);
mark = tmp;
- prpl_icon = pidgin_create_prpl_icon(chat->account, PIDGIN_PRPL_ICON_SMALL);
+ prpl_icon = pidgin_create_prpl_icon(purple_chat_get_account(chat), PIDGIN_PRPL_ICON_SMALL);
if (theme != NULL)
bgcolor = pidgin_blist_theme_get_contact_color(theme);
@@ -7420,11 +7420,11 @@
chat = (PurpleChat *)cnode;
- if(chat->account != account)
+ if(purple_chat_get_account(chat) != account)
continue;
if (purple_blist_node_get_bool((PurpleBlistNode*)chat, "gtk-autojoin"))
- serv_join_chat(gc, chat->components);
+ serv_join_chat(gc, purple_chat_get_components(chat));
}
}
diff -r 2fdc668362f0 -r 76096c42f558 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c Mon Oct 31 19:00:39 2011 +0000
+++ b/pidgin/gtkconv.c Mon Oct 31 19:21:14 2011 +0000
@@ -4604,7 +4604,7 @@
else if (PURPLE_BLIST_NODE_IS_BUDDY(node))
update_chat_alias((PurpleBuddy *)node, conv, gc, prpl_info);
else if (PURPLE_BLIST_NODE_IS_CHAT(node) &&
- purple_conversation_get_account(conv) == ((PurpleChat*)node)->account)
+ purple_conversation_get_account(conv) == purple_chat_get_account((PurpleChat*)node))
{
if (old_alias == NULL || g_utf8_collate(old_alias, purple_conversation_get_title(conv)) == 0)
pidgin_conv_update_fields(conv, PIDGIN_CONV_SET_TITLE);
@@ -7999,7 +7999,7 @@
if (prpl_info->chat_info_defaults != NULL)
comps = prpl_info->chat_info_defaults(gc, purple_conversation_get_name(conv));
} else {
- comps = chat->components;
+ comps = purple_chat_get_components(chat);
}
serv_join_chat(gc, comps);
if (chat == NULL && comps != NULL)
diff -r 2fdc668362f0 -r 76096c42f558 pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c Mon Oct 31 19:00:39 2011 +0000
+++ b/pidgin/gtkdialogs.c Mon Oct 31 19:21:14 2011 +0000
@@ -1155,7 +1155,7 @@
chat->alias, FALSE, FALSE, NULL,
_("Alias"), G_CALLBACK(pidgin_dialogs_alias_chat_cb),
_("Cancel"), NULL,
- chat->account, NULL, NULL,
+ purple_chat_get_account(chat), NULL, NULL,
chat);
}
@@ -1275,7 +1275,7 @@
} else if (PURPLE_BLIST_NODE_IS_CHAT(cnode)) {
PurpleChat *chat = (PurpleChat *)cnode;
cnode = cnode->next;
- if (purple_account_is_connected(chat->account))
+ if (purple_account_is_connected(purple_chat_get_account(chat)))
purple_blist_remove_chat(chat);
} else {
cnode = cnode->next;
@@ -1362,7 +1362,7 @@
name ? name : "");
purple_request_action(chat, NULL, _("Remove Chat"), text, 0,
- chat->account, NULL, NULL,
+ purple_chat_get_account(chat), NULL, NULL,
chat, 2,
_("_Remove Chat"), G_CALLBACK(pidgin_dialogs_remove_chat_cb),
_("Cancel"), NULL);