Mercurial > pidgin.yaz

changeset 21419:9fe16ecaa4ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Propagating ipp to im.pidgin.cpw.resiak.disconnectreason caused purple_account_clear_current_error to be replaced with a copy of signed_on_cb from later in account.c; fix it. Also, remove an unref that was added since pidgin_make_mini_dialog was gutted.
author Will Thompson <will.thompson@collabora.co.uk>
date Sat, 10 Nov 2007 13:06:12 +0000
parents 38cc722159ff
children 1ce05db42eb3
files libpurple/account.c pidgin/gtkutils.c
diffstat 2 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/account.c	Sat Nov 10 12:10:04 2007 +0000
+++ b/libpurple/account.c	Sat Nov 10 13:06:12 2007 +0000
@@ -2356,13 +2356,12 @@
 	return priv->current_error;
 }
 
-static void
-signed_on_cb(PurpleConnection *gc,
-             gpointer unused)
+void
+purple_account_clear_current_error(PurpleAccount *account)
 {
-	PurpleAccount *account = purple_connection_get_account(gc);
-	purple_account_clear_current_error(account);
+	set_current_error(account, NULL);
 }
+
 void
 purple_accounts_add(PurpleAccount *account)
 {
--- a/pidgin/gtkutils.c	Sat Nov 10 12:10:04 2007 +0000
+++ b/pidgin/gtkutils.c	Sat Nov 10 13:06:12 2007 +0000
@@ -2977,8 +2977,6 @@
 	}
 	va_end(args);
 
-	g_object_unref(sg);
-
 	g_signal_connect(G_OBJECT(mini_dialog), "destroy",
 		G_CALLBACK(old_mini_dialog_destroy_cb), cb_datas);