soc.2010.detachablepurple: 2212e5d9: Fixed runtime warning about dbus_path_go...

gillux at soc.pidgin.im gillux at soc.pidgin.im
Thu Aug 5 00:04:03 EDT 2010


----------------------------------------------------------------------
Revision: 2212e5d97fb82f465aff9f06791ea5536cb9726b
Parent:   706eb2b0f7a483ef3d094987bd3206aede820a2a
Author:   gillux at soc.pidgin.im
Date:     08/03/10 23:08:49
Branch:   im.pidgin.soc.2010.detachablepurple
URL: http://d.pidgin.im/viewmtn/revision/info/2212e5d97fb82f465aff9f06791ea5536cb9726b

Changelog: 

Fixed runtime warning about dbus_path_gobjects in purpled.

Changes against parent 706eb2b0f7a483ef3d094987bd3206aede820a2a

  patched  libpurple/pobject.c

-------------- next part --------------
============================================================
--- libpurple/pobject.c	e33e2d36455066c64b2bf2366e8a2b946e4332ea
+++ libpurple/pobject.c	daf5fd5e541dc062fcac8d824a27047d6dd6ac72
@@ -78,7 +78,9 @@ purple_object_dispose(GObject *obj)
 	g_signal_emit(pobj, signals[SIG_DESTROYING], 0);
 
 #ifdef HAVE_DBUS
-	purple_dbus_disassoc_gobject(priv->dbus_path);
+	/* Forget about the associated dbus path */
+	if (purple_core_is_remote_mode())
+		purple_dbus_disassoc_gobject(priv->dbus_path);
 #endif
 
 	if (priv->proto_data) {


More information about the Commits mailing list