im.pidgin.cpw.resiak.disconnectreason: 9ef6f213c70686d6e6f62c382a626a749bf4bf6c

[resiak at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 9ef6f213c70686d6e6f62c382a626a749bf4bf6c
Ancestor: 097f8049335769448a96addc39ffa7611c1da432
Author: resiak at soc.pidgin.im
Date: 2007-11-10T13:06:12
Branch: im.pidgin.cpw.resiak.disconnectreason

Modified files:
        libpurple/account.c pidgin/gtkutils.c

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- libpurple/account.c	693b3293bbf277cb981629afc30987987a9095de
+++ libpurple/account.c	3b1f4d15ef0e296ee1c6a2f93fb4dcca7b35a5cb
@@ -2356,13 +2356,12 @@ purple_account_get_current_error(PurpleA
 	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)
 {
============================================================
--- pidgin/gtkutils.c	f48f2a185ca27887e7efcdb7b295570c291c61fb
+++ pidgin/gtkutils.c	7f10d3507856bccc21d59161144e3ddd73986569
@@ -2977,8 +2977,6 @@ pidgin_make_mini_dialog(PurpleConnection
 	}
 	va_end(args);
 
-	g_object_unref(sg);
-
 	g_signal_connect(G_OBJECT(mini_dialog), "destroy",
 		G_CALLBACK(old_mini_dialog_destroy_cb), cb_datas);