merge of '25d5c4a54215f26c9b209867134b305ddd114faf'

Wed, 27 Feb 2008 00:24:57 +0000

author
Etan Reisner <deryni@pidgin.im>
date
Wed, 27 Feb 2008 00:24:57 +0000
changeset 22473
7ec40d30e4af
parent 22472
25d5c4a54215 (current diff)
parent 22467
151133154190 (diff)
child 22483
1a52b347dfb2

merge of '25d5c4a54215f26c9b209867134b305ddd114faf'
and '151133154190baad8941973a7cf9c87bf478132e'

libpurple/account.c file | annotate | diff | comparison | revisions
--- a/libpurple/account.c	Tue Feb 26 14:28:52 2008 +0000
+++ b/libpurple/account.c	Wed Feb 27 00:24:57 2008 +0000
@@ -751,6 +751,7 @@
 		description = g_strdup("");
 
 	current_error = g_new0(PurpleConnectionErrorInfo, 1);
+	PURPLE_DBUS_REGISTER_POINTER(current_error, PurpleConnectionErrorInfo);
 	current_error->type = type;
 	current_error->description = description;
 
@@ -1009,6 +1010,7 @@
 		purple_log_free(account->system_log);
 
 	priv = PURPLE_ACCOUNT_GET_PRIVATE(account);
+	PURPLE_DBUS_UNREGISTER_POINTER(priv->current_error);
 	g_free(priv->current_error);
 	g_free(priv);
 
@@ -2365,8 +2367,7 @@
 }
 
 static void
-set_current_error(PurpleAccount *account,
-                  PurpleConnectionErrorInfo *new_err)
+set_current_error(PurpleAccount *account, PurpleConnectionErrorInfo *new_err)
 {
 	PurpleAccountPrivate *priv;
 	PurpleConnectionErrorInfo *old_err;
@@ -2389,6 +2390,7 @@
 	if(old_err)
 		g_free(old_err->description);
 
+	PURPLE_DBUS_UNREGISTER_POINTER(old_err);
 	g_free(old_err);
 }
 

mercurial