Attachment 2608 Details for Bug 3162 – Improved patch

[patch] Improved patch

dbus-unregister.diff (text/plain), 1.53 KB, created by Ross Burton on 2005-05-02 09:24:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ross Burton

Created: 2005-05-02 09:24:06 UTC

Size: 1.53 KB

patch

obsolete

>Index: glib/dbus-gobject.c
>===================================================================
>RCS file: /cvs/dbus/dbus/glib/dbus-gobject.c,v
>retrieving revision 1.21
>diff -u -r1.21 dbus-gobject.c
>--- glib/dbus-gobject.c	27 Feb 2005 17:38:12 -0000	1.21
>+++ glib/dbus-gobject.c	2 May 2005 16:22:25 -0000
>@@ -1048,6 +1048,15 @@
>   g_static_rw_lock_writer_unlock (&info_hash_lock);
> }
> 
>+static void
>+unregister_gobject(DBusGConnection *connection, GObject *dead)
>+{
>+  char *path;
>+  path = g_object_steal_data (dead, "dbus_glib_object_path");
>+  dbus_connection_unregister_object_path (DBUS_CONNECTION_FROM_G_CONNECTION (connection), path);
>+  g_free (path);
>+}
>+
> /**
>  * Registers a GObject at the given path. Properties, methods, and signals
>  * of the object can then be accessed remotely. Methods are only available
>@@ -1073,12 +1082,13 @@
>   if (!dbus_connection_register_object_path (DBUS_CONNECTION_FROM_G_CONNECTION (connection),
>                                              at_path,
>                                              &gobject_dbus_vtable,
>-                                             object))
>+                                             object)) {
>     g_error ("Failed to register GObject with DBusConnection");
>+    return;
>+  }
> 
>-  /* FIXME set up memory management (so we break the
>-   * registration if object or connection vanishes)
>-   */
>+  g_object_set_data (object, "dbus_glib_object_path", g_strdup (at_path));
>+  g_object_weak_ref (object, (GWeakNotify)unregister_gobject, connection);
> }
> 
> /** @} */ /* end of public API */

Actions: View | Splinter Review

Attachments on bug 3162: 2594 | 2595 | 2608

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.