gobjectification: 4ba4b224: Fix finch and pidgin compile.

qulogic at pidgin.im qulogic at pidgin.im
Tue Jun 9 01:01:08 EDT 2009


-----------------------------------------------------------------
Revision: 4ba4b224fe488af8e48d3d528c39801d243b0de2
Ancestor: 403b15430706e2ebfbc9bb83b7b1294ff7bce67e
Author: qulogic at pidgin.im
Date: 2009-06-09T04:22:47
Branch: im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/4ba4b224fe488af8e48d3d528c39801d243b0de2

Modified files:
        finch/gntaccount.c pidgin/gtkblist.c pidgin/gtkconv.c

ChangeLog: 

Fix finch and pidgin compile.

-------------- next part --------------
============================================================
--- finch/gntaccount.c	beb74328c51f12a10d63a3c7eec11a12f006a2a6
+++ finch/gntaccount.c	d6ee26ece75e2d26bde951a31392aa2bdd040d34
@@ -685,7 +685,7 @@ account_toggled(GntWidget *widget, void 
 		purple_savedstatus_activate_for_account(purple_savedstatus_get_current(),
 												account);
 
-	purple_account_set_enabled(account, FINCH_UI, enabled);
+	purple_account_set_enabled(account, enabled);
 }
 
 static gboolean
============================================================
--- pidgin/gtkblist.c	78ceb93e35cac0a7d016d93751fc37cfbf79d743
+++ pidgin/gtkblist.c	cd75b9b4d5f0a9ec8e3479448b45766084033548
@@ -966,7 +966,7 @@ chat_account_filter_func(PurpleAccount *
 	PurpleConnection *gc = purple_account_get_connection(account);
 	PurplePluginProtocolInfo *prpl_info = NULL;
 
-	prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl);
+	prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc));
 
 	return (prpl_info->chat_info != NULL);
 }
@@ -4053,7 +4053,7 @@ pidgin_blist_get_name_markup(PurpleBuddy
 		if (prpl != NULL)
 			prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
 
-		if (prpl_info && prpl_info->status_text && b->account->gc) {
+		if (prpl_info && prpl_info->status_text && purple_account_get_connection(b->account)) {
 			char *tmp = prpl_info->status_text(b);
 			const char *end;
 
============================================================
--- pidgin/gtkconv.c	1a4e1c241566e3af68e600c73903cd040db44280
+++ pidgin/gtkconv.c	d654827dd160ef8e080c82b5b8d45d3a570a93c9
@@ -5014,7 +5014,7 @@ conv_dnd_recv(GtkWidget *widget, GdkDrag
 	PurpleConversation *c;
 	PurpleAccount *convaccount = purple_conversation_get_account(conv);
 	PurpleConnection *gc = purple_account_get_connection(convaccount);
-	PurplePluginProtocolInfo *prpl_info = gc ? PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl) : NULL;
+	PurplePluginProtocolInfo *prpl_info = gc ? PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc)) : NULL;
 
 	if (sd->target == gdk_atom_intern("PURPLE_BLIST_NODE", FALSE))
 	{


More information about the Commits mailing list