gobjectification: c6106051: Compile pidgin.

sadrul at pidgin.im sadrul at pidgin.im
Tue Jul 13 18:04:11 EDT 2010


----------------------------------------------------------------------
Revision: c610605152722fa92e57831e5824058afe84f407
Parent:   49c6e7d085ef9b1eb356cb7ac8fa23249f6e3219
Author:   sadrul at pidgin.im
Date:     07/13/10 17:26:22
Branch:   im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/c610605152722fa92e57831e5824058afe84f407

Changelog: 

Compile pidgin.

Changes against parent 49c6e7d085ef9b1eb356cb7ac8fa23249f6e3219

  patched  pidgin/gtkaccount.c
  patched  pidgin/gtkblist.c
  patched  pidgin/gtkconn.c
  patched  pidgin/gtkdialogs.c
  patched  pidgin/gtkdocklet.c
  patched  pidgin/gtklog.c
  patched  pidgin/gtkmain.c
  patched  pidgin/gtkpounce.c
  patched  pidgin/gtksavedstatuses.c
  patched  pidgin/gtkstatusbox.c
  patched  pidgin/gtkutils.c
  patched  pidgin/plugins/xmppconsole.c

-------------- next part --------------
============================================================
--- pidgin/gtkutils.c	315800587039d036156d7df5ce74c340c50da068
+++ pidgin/gtkutils.c	c38563a7860ded3735b78cd31cc65d54a31255c7
@@ -45,10 +45,11 @@
 
 #include <gdk/gdkkeysyms.h>
 
-#include "accountmanager.h"
+#include "accountlist.h"
 #include "conversation.h"
 #include "debug.h"
 #include "desktopitem.h"
+#include "gsignal.h"
 #include "imgstore.h"
 #include "notify.h"
 #include "prefs.h"
@@ -774,7 +775,7 @@ create_account_menu(PurpleAccount *defau
 	char buf[256];
 
 	if (show_all)
-		list = purple_accounts_get_all();
+		list = purple_accounts_all();
 	else
 		list = purple_connections_get_all();
 
@@ -857,7 +858,7 @@ static void
 }
 
 static void
-account_menu_added_removed_cb(PurpleAccountManager *manager, PurpleAccount *account, GtkWidget *optmenu)
+account_menu_added_removed_cb(PurpleAccount *account, GtkWidget *optmenu)
 {
 	regenerate_account_menu(optmenu);
 }
@@ -883,6 +884,7 @@ pidgin_account_option_menu_new(PurpleAcc
 								 PurpleFilterAccountFunc filter_func,
 								 gpointer user_data)
 {
+	gpointer handler;
 	GtkWidget *optmenu;
 
 	/* Create the option menu */
@@ -906,10 +908,15 @@ pidgin_account_option_menu_new(PurpleAcc
 						optmenu, PURPLE_CALLBACK(account_menu_added_removed_cb),
 						optmenu);
 #else
-	g_signal_connect(purple_account_manager_get(), "account-added",
+	handler = purple_g_signal_connect(PURPLE_TYPE_ACCOUNT, "new",
 			G_CALLBACK(account_menu_added_removed_cb), optmenu);
-	g_signal_connect(purple_account_manager_get(), "account-removed",
+	g_object_set_data_full(G_OBJECT(optmenu), "new-handler",
+			handler, (GDestroyNotify)purple_g_signal_disconnect);
+
+	handler = purple_g_signal_connect_after(PURPLE_TYPE_ACCOUNT, "destroyed",
 			G_CALLBACK(account_menu_added_removed_cb), optmenu);
+	g_object_set_data_full(G_OBJECT(optmenu), "destroy-handler",
+			handler, (GDestroyNotify)purple_g_signal_disconnect);
 #endif
 
 	/* Set some data. */
@@ -917,13 +924,6 @@ pidgin_account_option_menu_new(PurpleAcc
 	g_object_set_data(G_OBJECT(optmenu), "show_all", GINT_TO_POINTER(show_all));
 	g_object_set_data(G_OBJECT(optmenu), "filter_func", filter_func);
 
-	void disconnect(gpointer optmenu)
-	{
-		g_signal_handlers_disconnect_matched(purple_account_manager_get(),
-				G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, optmenu);
-	}
-	g_signal_connect(G_OBJECT(optmenu), "destroy", G_CALLBACK(disconnect), NULL);
-
 	return optmenu;
 }
 
@@ -1123,7 +1123,7 @@ pidgin_parse_x_im_contact(const char *ms
 			const char *protoname;
 
 			if (all_accounts)
-				list = purple_accounts_get_all();
+				list = purple_accounts_all();
 			else
 				list = purple_connections_get_all();
 
@@ -2103,12 +2103,10 @@ buddyname_autocomplete_destroyed_cb(GtkW
 {
 	g_free(data);
 	purple_signals_disconnect_by_handle(widget);
-	g_signal_handlers_disconnect_matched(purple_account_manager_get(),
-			G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, data);
 }
 
 static void
-repopulate_autocomplete(PurpleAccountManager *manager, gpointer something, gpointer data)
+repopulate_autocomplete(gpointer something, gpointer data)
 {
 	add_completion_list(data);
 }
@@ -2173,9 +2171,9 @@ pidgin_setup_screenname_autocomplete_wit
 						PURPLE_CALLBACK(repopulate_autocomplete), data);
 #else
 #warning TODO: The autocomplete needs to be repopulated on sign-on/off too.
-	g_signal_connect(purple_account_manager_get(), "account-added",
+	purple_g_signal_connect(PURPLE_TYPE_ACCOUNT, "new",
 			G_CALLBACK(repopulate_autocomplete), data);
-	g_signal_connect(purple_account_manager_get(), "account-removed",
+	purple_g_signal_connect(PURPLE_TYPE_ACCOUNT, "destroyed",
 			G_CALLBACK(repopulate_autocomplete), data);
 #endif
 
============================================================
--- pidgin/gtkpounce.c	171222376c8ab9796c6b4f1f1b7701ff7ee86438
+++ pidgin/gtkpounce.c	9656cb05ff6844f92164e46b63d9df4f9215326c
@@ -27,7 +27,7 @@
 #include "internal.h"
 #include "pidgin.h"
 
-#include "account.h"
+#include "accountlist.h"
 #include "conversation.h"
 #include "debug.h"
 #include "prpl.h"
@@ -502,7 +502,7 @@ pidgin_pounce_editor_show(PurpleAccount 
 
 	g_return_if_fail((cur_pounce != NULL) ||
 	                 (account != NULL) ||
-	                 (purple_accounts_get_all() != NULL));
+	                 (purple_accounts_all() != NULL));
 
 	dialog = g_new0(PidginPounceDialog, 1);
 
@@ -527,7 +527,7 @@ pidgin_pounce_editor_show(PurpleAccount 
 			dialog->account = purple_connection_get_account(gc);
 		}
 		else
-			dialog->account = purple_accounts_get_all()->data;
+			dialog->account = purple_accounts_all()->data;
 
 		dialog->pounce  = NULL;
 	}
@@ -1363,7 +1363,7 @@ pidgin_pounces_manager_show(void)
 
 	/* Add button */
 	button = pidgin_dialog_add_button(GTK_DIALOG(win), PIDGIN_STOCK_ADD, G_CALLBACK(pounces_manager_add_cb), dialog);
-	gtk_widget_set_sensitive(button, (purple_accounts_get_all() != NULL));
+	gtk_widget_set_sensitive(button, (purple_accounts_all() != NULL));
 
 	purple_signal_connect(NULL, "signed-on",
 						pounces_manager, PURPLE_CALLBACK(pounces_manager_connection_cb), button);
============================================================
--- pidgin/gtkblist.c	d2804e5f867f276d73620213543d951c3e813ad2
+++ pidgin/gtkblist.c	712a39e1a7d0ad4914544514b7603e1d37858ce9
@@ -27,7 +27,7 @@
 #include "internal.h"
 #include "pidgin.h"
 
-#include "account.h"
+#include "accountlist.h"
 #include "connection.h"
 #include "core.h"
 #include "debug.h"
@@ -3427,7 +3427,7 @@ edit_mood_cb(PurpleConnection *gc, Purpl
 
 			update_status_with_mood(account, mood, text);
 		} else {
-			GList *accounts = purple_accounts_get_all_active();
+			GList *accounts = purple_accounts_actives();
 
 			for (; accounts ; accounts = g_list_delete_link(accounts, accounts)) {
 				PurpleAccount *account = (PurpleAccount *) accounts->data;
@@ -3457,7 +3457,7 @@ get_global_moods(void)
 		g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL);
 	GHashTable *mood_counts =
 		g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL);
-	GList *accounts = purple_accounts_get_all_active();
+	GList *accounts = purple_accounts_actives();
 	PurpleMood *result = NULL;
 	GList *out_moods = NULL;
 	int i = 0;
@@ -3521,7 +3521,7 @@ get_global_mood_status(void)
 static const gchar *
 get_global_mood_status(void)
 {
-	GList *accounts = purple_accounts_get_all_active();
+	GList *accounts = purple_accounts_actives();
 	const gchar *found_mood = NULL;
 	
 	for (; accounts ; accounts = g_list_delete_link(accounts, accounts)) {
@@ -4927,7 +4927,7 @@ static gboolean pidgin_blist_select_note
 	if (priv->error_scrollbook != NULL) {
 		errors = gtk_notebook_get_n_pages(GTK_NOTEBOOK(priv->error_scrollbook->notebook));
 	}
-	if ((list = purple_accounts_get_all_active()) != NULL || errors) {
+	if ((list = purple_accounts_actives()) != NULL || errors) {
 		gtk_notebook_set_current_page(GTK_NOTEBOOK(gtkblist->notebook), 1);
 		g_list_free(list);
 	} else
@@ -5462,7 +5462,7 @@ show_initial_account_errors(PidginBuddyL
 static void
 show_initial_account_errors(PidginBuddyList *gtkblist)
 {
-	GList *l = purple_accounts_get_all();
+	GList *l = purple_accounts_all();
 	PurpleAccount *account;
 	const PurpleConnectionErrorInfo *err;
 
@@ -8031,7 +8031,7 @@ pidgin_blist_update_accounts_menu(void)
 			gtk_widget_destroy(menuitem);
 	}
 
-	for (accounts = purple_accounts_get_all(); accounts; accounts = accounts->next) {
+	for (accounts = purple_accounts_all(); accounts; accounts = accounts->next) {
 		char *buf = NULL;
 		GtkWidget *image = NULL;
 		PurpleAccount *account = NULL;
@@ -8082,7 +8082,7 @@ pidgin_blist_update_accounts_menu(void)
 	pidgin_separator(accountmenu);
 	accel_group = gtk_menu_get_accel_group(GTK_MENU(accountmenu));
 
-	for (accounts = purple_accounts_get_all(); accounts; accounts = accounts->next) {
+	for (accounts = purple_accounts_all(); accounts; accounts = accounts->next) {
 		char *buf = NULL;
 		char *accel_path_buf = NULL;
 		GtkWidget *image = NULL;
============================================================
--- pidgin/gtkaccount.c	0ff7a497f718239a4b933de65c10c31c463c5c7d
+++ pidgin/gtkaccount.c	6ee32727ed71656cf8f577beb29cbe79122c4529
@@ -28,7 +28,7 @@
 #include "pidgin.h"
 
 #include "account.h"
-#include "accountmanager.h"
+#include "accountlist.h"
 #include "accountopt.h"
 #include "core.h"
 #include "debug.h"
@@ -1241,7 +1241,7 @@ ok_account_prefs_cb(GtkWidget *w, Accoun
 			return;
 		}
 
-		if (purple_accounts_get_all() == NULL) {
+		if (purple_accounts_all() == NULL) {
 			/* We're adding our first account.  Be polite and show the buddy list */
 			purple_blist_set_visible(TRUE);
 		}
@@ -1432,9 +1432,7 @@ ok_account_prefs_cb(GtkWidget *w, Accoun
 	}
 
 	/* If this is a new account, add it to our list */
-	if (new_acct)
-		purple_accounts_add(account);
-	else
+	if (!new_acct)
 		purple_signal_emit(pidgin_account_get_handle(), "account-modified", account);
 
 	/* If this is a new account, then sign on! */
@@ -1599,7 +1597,7 @@ signed_on_off_cb(PurpleConnection *gc, g
 
 	account = purple_connection_get_account(gc);
 	model = GTK_TREE_MODEL(accounts_window->model);
-	index = g_list_index(purple_accounts_get_all(), account);
+	index = g_list_index(purple_accounts_all(), account);
 
 	if (gtk_tree_model_iter_nth_child(model, &iter, NULL, index))
 	{
@@ -1649,7 +1647,7 @@ static void
 }
 
 static void
-account_removed_cb(PurpleAccountManager *manager, PurpleAccount *account, gpointer user_data)
+account_removed_cb(PurpleAccount *account, gpointer user_data)
 {
 	AccountPrefsDialog *dialog;
 	GtkTreeIter iter;
@@ -1665,7 +1663,7 @@ account_removed_cb(PurpleAccountManager 
 	if (accounts_window_find_account_in_treemodel(&iter, account))
 		gtk_list_store_remove(accounts_window->model, &iter);
 
-	if (purple_accounts_get_all() == NULL)
+	if (purple_accounts_all() == NULL)
 		gtk_notebook_set_current_page(GTK_NOTEBOOK(accounts_window->notebook), 0);
 }
 
@@ -1787,13 +1785,13 @@ drag_data_received_cb(GtkWidget *widget,
 				case GTK_TREE_VIEW_DROP_INTO_OR_AFTER:
 					move_account_after(dialog->model, &dialog->drag_iter,
 									   &iter);
-					dest_index = g_list_index(purple_accounts_get_all(),
+					dest_index = g_list_index(purple_accounts_all(),
 											  account) + 1;
 					break;
 
 				case GTK_TREE_VIEW_DROP_BEFORE:
 				case GTK_TREE_VIEW_DROP_INTO_OR_BEFORE:
-					dest_index = g_list_index(purple_accounts_get_all(),
+					dest_index = g_list_index(purple_accounts_all(),
 											  account);
 
 					move_account_before(dialog->model, &dialog->drag_iter,
@@ -1850,7 +1848,7 @@ delete_account_cb(PurpleAccount *account
 static void
 delete_account_cb(PurpleAccount *account)
 {
-	purple_accounts_delete(account);
+	g_object_unref(G_OBJECT(account));
 }
 
 static void
@@ -2075,7 +2073,7 @@ populate_accounts_list(AccountsWindow *d
 		}
 	}
 
-	for (l = purple_accounts_get_all(); l != NULL; l = l->next) {
+	for (l = purple_accounts_all(); l != NULL; l = l->next) {
 		ret = TRUE;
 		add_account_to_liststore(PURPLE_ACCOUNT(l->data), global_buddyicon);
 	}
@@ -2255,7 +2253,7 @@ global_buddyicon_changed(const char *nam
 			gconstpointer value, gpointer window)
 {
 	GList *list;
-	for (list = purple_accounts_get_all(); list; list = list->next) {
+	for (list = purple_accounts_all(); list; list = list->next) {
 		account_modified_cb(list->data, window);
 	}
 }
@@ -2596,7 +2594,7 @@ pidgin_account_init(void)
 #else
 	purple_g_signal_connect(PURPLE_TYPE_ACCOUNT, "new",
 			G_CALLBACK(add_account_to_liststore), NULL);
-	g_signal_connect(purple_account_manager_get(), "account-removed",
+	purple_g_signal_connect(PURPLE_TYPE_ACCOUNT, "destroying",
 			G_CALLBACK(account_removed_cb), NULL);
 #endif
 
============================================================
--- pidgin/gtkconn.c	58e0dae260a9752ae142fcd7c28b60f7a6ad0b16
+++ pidgin/gtkconn.c	86ef0c2ed422c4265ac215d53632e4d55ee019a8
@@ -26,7 +26,7 @@
 #include "internal.h"
 #include "pidgin.h"
 
-#include "account.h"
+#include "accountlist.h"
 #include "debug.h"
 #include "notify.h"
 #include "prefs.h"
@@ -182,7 +182,7 @@ static void pidgin_connection_network_co
 	if(gtkblist)
 		pidgin_status_box_set_network_available(PIDGIN_STATUS_BOX(gtkblist->statusbox), TRUE);
 
-	l = list = purple_accounts_get_all_active();
+	l = list = purple_accounts_actives();
 	while (l) {
 		PurpleAccount *account = (PurpleAccount*)l->data;
 		g_hash_table_remove(auto_reconns, account);
@@ -201,7 +201,7 @@ static void pidgin_connection_network_di
 	if(gtkblist)
 		pidgin_status_box_set_network_available(PIDGIN_STATUS_BOX(gtkblist->statusbox), FALSE);
 
-	l = list = purple_accounts_get_all_active();
+	l = list = purple_accounts_actives();
 	while (l) {
 		PurpleAccount *a = (PurpleAccount*)l->data;
 		if (!purple_account_is_disconnected(a)) {
============================================================
--- pidgin/gtklog.c	b2985a9ef9164e2a3d9851462bcd7234f5db69ce
+++ pidgin/gtklog.c	4b84c4f689a76a67f79d1f40e5b9164794521fb5
@@ -26,7 +26,7 @@
 #include "internal.h"
 #include "pidgin.h"
 
-#include "account.h"
+#include "accountlist.h"
 #include "debug.h"
 #include "log.h"
 #include "notify.h"
@@ -818,7 +818,7 @@ void pidgin_syslog_show()
 		return;
 	}
 
-	for(accounts = purple_accounts_get_all(); accounts != NULL; accounts = accounts->next) {
+	for(accounts = purple_accounts_all(); accounts != NULL; accounts = accounts->next) {
 
 		PurpleAccount *account = (PurpleAccount *)accounts->data;
 		if(purple_find_prpl(purple_account_get_protocol_id(account)) == NULL)
============================================================
--- pidgin/gtkdialogs.c	3fbe33ae8080dd105992eb69d247a160b2ee6357
+++ pidgin/gtkdialogs.c	d4b9d819ff3920a12668c50370ca86fc36779dc7
@@ -29,6 +29,7 @@
 #include "pidgin.h"
 #include "package_revision.h"
 
+#include "accountlist.h"
 #include "debug.h"
 #include "notify.h"
 #include "prpl.h"
@@ -1037,16 +1038,16 @@ pidgin_dialogs_log(void)
 	 * connected, and it sets it from the list of connected accounts.  Since
 	 * we're going to set show_all here, it makes sense to use the first
 	 * account, not the first connected account. */
-	if (purple_accounts_get_all() != NULL) {
-		purple_request_field_account_set_default_value(field, purple_accounts_get_all()->data);
-		purple_request_field_account_set_value(field, purple_accounts_get_all()->data);
+	if (purple_accounts_all() != NULL) {
+		purple_request_field_account_set_default_value(field, purple_accounts_all()->data);
+		purple_request_field_account_set_value(field, purple_accounts_all()->data);
 	}
 
 	purple_request_field_set_type_hint(field, "account");
 	purple_request_field_account_set_show_all(field, TRUE);
 	purple_request_field_set_visible(field,
-		(purple_accounts_get_all() != NULL &&
-		 purple_accounts_get_all()->next != NULL));
+		(purple_accounts_all() != NULL &&
+		 purple_accounts_all()->next != NULL));
 	purple_request_field_set_required(field, TRUE);
 	purple_request_field_group_add_field(group, field);
 
============================================================
--- pidgin/gtkmain.c	bed2ebcf6ea80e26bfee1b6c55e5b3bc9add2c57
+++ pidgin/gtkmain.c	6fc981b3afd6c8b92b87e057a42cb53442f098d1
@@ -24,7 +24,7 @@
 #include "internal.h"
 #include "pidgin.h"
 
-#include "account.h"
+#include "accountlist.h"
 #include "conversation.h"
 #include "core.h"
 #include "dbus-maybe.h"
@@ -133,7 +133,7 @@ dologin_named(const char *name)
 	} else { /* no name given, use the first account */
 		GList *accounts;
 
-		accounts = purple_accounts_get_all();
+		accounts = purple_accounts_all();
 		if (accounts != NULL)
 		{
 			account = (PurpleAccount *)accounts->data;
@@ -934,7 +934,7 @@ int main(int argc, char *argv[])
 
 	if (opt_login) {
 		/* disable all accounts */
-		for (accounts = purple_accounts_get_all(); accounts != NULL; accounts = accounts->next) {
+		for (accounts = purple_accounts_all(); accounts != NULL; accounts = accounts->next) {
 			PurpleAccount *account = accounts->data;
 			purple_account_set_enabled(account, FALSE);
 		}
@@ -968,7 +968,7 @@ int main(int argc, char *argv[])
 		purple_accounts_restore_current_statuses();
 	}
 
-	if ((active_accounts = purple_accounts_get_all_active()) == NULL)
+	if ((active_accounts = purple_accounts_actives()) == NULL)
 	{
 		pidgin_accounts_window_show();
 	}
============================================================
--- pidgin/gtksavedstatuses.c	baf9702ed3a86eeed8467628a74c8e6219362f9d
+++ pidgin/gtksavedstatuses.c	5e26620e346b43fb62b7548882fcfd03c3f04df0
@@ -26,7 +26,7 @@
 
 #include "internal.h"
 
-#include "account.h"
+#include "accountlist.h"
 #include "notify.h"
 #include "request.h"
 #include "savedstatuses.h"
@@ -1065,7 +1065,7 @@ status_editor_populate_list(StatusEditor
 
 	gtk_list_store_clear(dialog->model);
 
-	for (iter = purple_accounts_get_all(); iter != NULL; iter = iter->next)
+	for (iter = purple_accounts_all(); iter != NULL; iter = iter->next)
 	{
 		PurpleAccount *account = (PurpleAccount *)iter->data;
 
============================================================
--- pidgin/gtkstatusbox.c	d71d3578e33aa84ccc6990c0c2fd34c71be58a3b
+++ pidgin/gtkstatusbox.c	4a7f3aa44f5372e9a07801602a5ac03c9311494f
@@ -44,7 +44,7 @@
 
 #include "internal.h"
 
-#include "account.h"
+#include "accountlist.h"
 #include "buddyicon.h"
 #include "core.h"
 #include "gsignal.h"
@@ -1008,7 +1008,7 @@ static PurpleAccount* check_active_accou
  * statuses and a token account if they do */
 static PurpleAccount* check_active_accounts_for_identical_statuses(void)
 {
-	GList *iter, *active_accts = purple_accounts_get_all_active();
+	GList *iter, *active_accts = purple_accounts_actives();
 	PurpleAccount *acct1 = NULL;
 	const char *prpl1 = NULL;
 
@@ -1484,7 +1484,7 @@ buddy_icon_set_cb(const char *filename, 
 		}
 	} else {
 		GList *accounts;
-		for (accounts = purple_accounts_get_all(); accounts != NULL; accounts = accounts->next) {
+		for (accounts = purple_accounts_all(); accounts != NULL; accounts = accounts->next) {
 			PurpleAccount *account = accounts->data;
 			PurplePlugin *plug = purple_find_prpl(purple_account_get_protocol_id(account));
 			if (plug) {
@@ -2399,7 +2399,7 @@ activate_currently_selected_status(Pidgi
 			/* Manually find the appropriate transient status */
 			if (status_box->token_status_account) {
 				GList *iter = purple_savedstatuses_get_all();
-				GList *tmp, *active_accts = purple_accounts_get_all_active();
+				GList *tmp, *active_accts = purple_accounts_actives();
 
 				for (; iter != NULL; iter = iter->next) {
 					PurpleSavedStatus *ss = iter->data;
@@ -2445,7 +2445,7 @@ activate_currently_selected_status(Pidgi
 				saved_status = purple_savedstatus_new(NULL, primitive);
 				purple_savedstatus_set_message(saved_status, message);
 				if (status_box->token_status_account) {
-					GList *tmp, *active_accts = purple_accounts_get_all_active();
+					GList *tmp, *active_accts = purple_accounts_actives();
 					for (tmp = active_accts; tmp != NULL; tmp = tmp->next) {
 						purple_savedstatus_set_substatus(saved_status,
 							(PurpleAccount*) tmp->data, acct_status_type, message);
@@ -2657,7 +2657,7 @@ static void pidgin_status_box_changed(Pi
 	if (status_box->account)
 		accounts = g_list_prepend(accounts, status_box->account);
 	else
-		accounts = purple_accounts_get_all_active();
+		accounts = purple_accounts_actives();
 	status_box->imhtml_visible = FALSE;
 	for (node = accounts; node != NULL; node = node->next)
 	{
============================================================
--- pidgin/gtkdocklet.c	22e93fe2567fe2748ce0febaf5092ca9324b9a44
+++ pidgin/gtkdocklet.c	9e68e0f474d67566af4a55b8ca7ed73746d7ab43
@@ -24,6 +24,7 @@
 #include "internal.h"
 #include "pidgin.h"
 
+#include "accountlist.h"
 #include "core.h"
 #include "conversation.h"
 #include "debug.h"
@@ -185,7 +186,7 @@ docklet_update_status(void)
 		g_free(tooltip_text);
 	}
 
-	for(l = purple_accounts_get_all(); l != NULL; l = l->next) {
+	for(l = purple_accounts_all(); l != NULL; l = l->next) {
 
 		PurpleAccount *account = (PurpleAccount*)l->data;
 		PurpleStatus *account_status;
@@ -392,7 +393,7 @@ create_transient_status(PurpleStatusPrim
 	PurpleSavedStatus *saved_status = purple_savedstatus_new(NULL, primitive);
 
 	if(status_type != NULL) {
-		GList *tmp, *active_accts = purple_accounts_get_all_active();
+		GList *tmp, *active_accts = purple_accounts_actives();
 		for (tmp = active_accts; tmp != NULL; tmp = tmp->next) {
 			purple_savedstatus_set_substatus(saved_status,
 				(PurpleAccount*) tmp->data, status_type, NULL);
@@ -410,7 +411,7 @@ activate_status_account_cb(GtkMenuItem *
 	PurpleStatusPrimitive primitive;
 	PurpleSavedStatus *saved_status = NULL;
 	GList *iter = purple_savedstatuses_get_all();
-	GList *tmp, *active_accts = purple_accounts_get_all_active();
+	GList *tmp, *active_accts = purple_accounts_actives();
 
 	status_type = (PurpleStatusType *)user_data;
 	primitive = purple_status_type_get_primitive(status_type);
============================================================
--- pidgin/plugins/xmppconsole.c	e3f6f4dcc32c2210280f5d4a2b549d83c8d52de1
+++ pidgin/plugins/xmppconsole.c	f6ace9ce7615e3575058bac6e52dfbd0cd7f10cd
@@ -20,6 +20,7 @@
  */
 
 #include "internal.h"
+#include "accountlist.h"
 #include "gtkplugin.h"
 #include "version.h"
 #include "prpl.h"


More information about the Commits mailing list