Revision: 18007
http://svn.sourceforge.net/gaim/?rev=18007&view=rev
Author: thekingant
Date: 2006-12-15 00:23:28 -0800 (Fri, 15 Dec 2006)
Log Message:
-----------
If status.xml contained a substatus without an account for whatever
reason, then we were registering a GaimSavedStatusSub with dbus,
freeing it shortly therafter, but not unregistering it with dbus.
Modified Paths:
--------------
trunk/libgaim/savedstatuses.c
Modified: trunk/libgaim/savedstatuses.c
===================================================================
--- trunk/libgaim/savedstatuses.c 2006-12-15 07:46:08 UTC (rev 18006)
+++ trunk/libgaim/savedstatuses.c 2006-12-15 08:23:28 UTC (rev 18007)
@@ -373,7 +373,6 @@
char *data;
ret = g_new0(GaimSavedStatusSub, 1);
- GAIM_DBUS_REGISTER_POINTER(ret, GaimSavedStatusSub);
/* Read the account */
node = xmlnode_get_child(substatus, "account");
@@ -410,6 +409,7 @@
ret->message = data;
}
+ GAIM_DBUS_REGISTER_POINTER(ret, GaimSavedStatusSub);
return ret;
}
@@ -447,7 +447,6 @@
int i;
ret = g_new0(GaimSavedStatus, 1);
- GAIM_DBUS_REGISTER_POINTER(ret, GaimSavedStatus);
attrib = xmlnode_get_attrib(status, "transient");
if ((attrib == NULL) || (strcmp(attrib, "true")))
@@ -506,6 +505,7 @@
ret->substatuses = g_list_prepend(ret->substatuses, new);
}
+ GAIM_DBUS_REGISTER_POINTER(ret, GaimSavedStatus);
return ret;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
