pidgin.yaz: pidgin/gtkblist.c comparison

comparison pidgin/gtkblist.c @ 32809:76096c42f558

Use the PurpleChat accessor functions.

author	andrew.victor@mxit.com
date	Mon, 31 Oct 2011 19:21:14 +0000
parents	2fdc668362f0
children	cd46874707b1

comparison

equal deleted inserted replaced

-:2fdc668362f0
+:76096c42f558
 	pidgin_new_check_item(menu, _("Persistent"),
 			G_CALLBACK(gtk_blist_menu_persistent_cb), node, persistent);
 	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);
 	pidgin_new_item_from_stock(menu, _("_Edit Settings..."), NULL,
 	char *tmp = NULL, *node_name = NULL, *tooltip_text = NULL;
 	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;
 	td->status_icon = pidgin_blist_get_status_icon(node, PIDGIN_STATUS_ICON_LARGE);
 	td->avatar = pidgin_blist_get_buddy_icon(node, !full, FALSE);
 		char *name, *value;
 		PurpleConversation *conv;
 		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, _("<b>Account:</b> %s"), tmp);
 			g_free(tmp);
 		}
 		if (bnode && bnode->conv.conv) {
 			conv = bnode->conv.conv;
 		} 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);
 		}
 		if (conv && !purple_conv_chat_has_left(PURPLE_CONV_CHAT(conv))) {
 			g_string_append_printf(str, _("\n<b>Occupants:</b> %d"),
 				g_free(topic);
 			}
 		}
 		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;
 		while (cur != NULL)
 		{
 			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<b>%s</b> %s",
 							name ? name : "",
 							value ? value : "");
 				g_free(name);
 				g_free(value);
 		PurplePlugin *prpl;
 		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)
 			return NULL;
 	}
 	/* First things first, update the group */
 	pidgin_blist_update_group(list, node->parent);
 	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;
 		gchar *mark, *tmp;
 		gboolean showicons = purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons");
 				  	  font, hidden ? "bold" : "normal", mark);
 		}
 		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);
 		gtk_tree_store_set(gtkblist->treemodel, &iter,
 			if(!PURPLE_BLIST_NODE_IS_CHAT(cnode))
 				continue;
 			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));
 		}
 	}
 	/* Stop processing; we handled the autojoins. */
 	return TRUE;

Mercurial > pidgin.yaz

comparison pidgin/gtkblist.c @ 32809:76096c42f558