soc.2010.detachablepurple: 62ec68c4: DBus path name of PurpleObjects now set ...
gillux at soc.pidgin.im
gillux at soc.pidgin.im
Thu Aug 5 22:20:29 EDT 2010
----------------------------------------------------------------------
Revision: 62ec68c42ce9e3256e5ae62609a64f2873918623
Parent: f0188d5d00f9b9c0966b0bc39b6e8eeed3a6162e
Author: gillux at soc.pidgin.im
Date: 08/05/10 13:53:38
Branch: im.pidgin.soc.2010.detachablepurple
URL: http://d.pidgin.im/viewmtn/revision/info/62ec68c42ce9e3256e5ae62609a64f2873918623
Changelog:
DBus path name of PurpleObjects now set on clients too. They need it too
because they run purple_dbus_disassoc_gobject().
Changes against parent f0188d5d00f9b9c0966b0bc39b6e8eeed3a6162e
patched libpurple/pobject.c
-------------- next part --------------
============================================================
--- libpurple/pobject.c daf5fd5e541dc062fcac8d824a27047d6dd6ac72
+++ libpurple/pobject.c 03b2435f61709c430211384c09f052199e8ec893
@@ -478,9 +478,6 @@ purple_object_install_dbus_infos(PurpleO
purple_dbus_get_g_connection(),
dbus_path, G_OBJECT(pobj));
- /* Remember the dbus path we expose our object at */
- purple_object_set_dbus_path(pobj, dbus_path);
-
/* Remember the purple interface */
purple_object_set_dbus_obj_interface(pobj, dbus_interface);
@@ -491,6 +488,11 @@ purple_object_install_dbus_infos(PurpleO
G_CALLBACK(purple_object_forward_notify_cb),
NULL);
}
+
+ /* Remember the dbus path we expose our object (daemon mode)
+ * or we got our object from (remote mode) */
+ purple_object_set_dbus_path(pobj, dbus_path);
+
}
static GQuark
More information about the Commits
mailing list