# HG changeset patch
# User Will Thompson <will.thompson@collabora.co.uk>
# Date 1194699972 0
# Node ID 9fe16ecaa4ab42fc11ad855f24cfe18946ee3b81
# Parent  38cc722159ffaa71380bba262403dbf87256ed7b
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.

diff -r 38cc722159ff -r 9fe16ecaa4ab libpurple/account.c
--- 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)
 {
diff -r 38cc722159ff -r 9fe16ecaa4ab pidgin/gtkutils.c
--- 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);