Attachment 46295 Details for Bug 32087 – [PATCH 1/4] fd.o #32087: emit signals on the appropriate connections

[patch] [PATCH 1/4] fd.o #32087: emit signals on the appropriate connections

0001-fd.o-32087-emit-signals-on-the-appropriate-connectio.patch (text/plain), 3.43 KB, created by Simon McVittie on 2011-05-03 10:57:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-05-03 10:57:01 UTC

Size: 3.43 KB

patch

obsolete

>From 44afc10db08fa926024dc2408f9891fc5f5d23d4 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 3 May 2011 18:19:44 +0100
>Subject: [PATCH 1/4] fd.o #32087: emit signals on the appropriate connections
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32087
>---
> dbus/dbus-gobject.c |   23 +++++------------------
> 1 files changed, 5 insertions(+), 18 deletions(-)
>
>diff --git a/dbus/dbus-gobject.c b/dbus/dbus-gobject.c
>index fc8f7ed..74bc204 100644
>--- a/dbus/dbus-gobject.c
>+++ b/dbus/dbus-gobject.c
>@@ -2065,8 +2065,7 @@ typedef struct {
> } DBusGSignalClosure;
> 
> static GClosure *
>-dbus_g_signal_closure_new (DBusGConnection *connection,
>-			   GObject         *object,
>+dbus_g_signal_closure_new (GObject         *object,
> 			   const char      *signame,
> 			   const char      *sigiface)
> {
>@@ -2074,7 +2073,6 @@ dbus_g_signal_closure_new (DBusGConnection *connection,
>   
>   closure = (DBusGSignalClosure*) g_closure_new_simple (sizeof (DBusGSignalClosure), NULL);
> 
>-  closure->connection = dbus_g_connection_ref (connection);
>   closure->object = object;
>   closure->signame = signame;
>   closure->sigiface = sigiface;
>@@ -2082,15 +2080,6 @@ dbus_g_signal_closure_new (DBusGConnection *connection,
> }
> 
> static void
>-dbus_g_signal_closure_finalize (gpointer data,
>-				GClosure *closure)
>-{
>-  DBusGSignalClosure *sigclosure = (DBusGSignalClosure *) closure;
>-
>-  dbus_g_connection_unref (sigclosure->connection);
>-}
>-
>-static void
> emit_signal_for_registration (ObjectRegistration *o,
>                               DBusGSignalClosure *sigclosure,
>                               GValue             *retval,
>@@ -2123,7 +2112,7 @@ emit_signal_for_registration (ObjectRegistration *o,
>           goto out;
>         }
>     }
>-  dbus_connection_send (DBUS_CONNECTION_FROM_G_CONNECTION (sigclosure->connection),
>+  dbus_connection_send (DBUS_CONNECTION_FROM_G_CONNECTION (o->connection),
>                         signal, NULL);
> out:
>   dbus_message_unref (signal);
>@@ -2155,7 +2144,7 @@ signal_emitter_marshaller (GClosure        *closure,
> }
> 
> static void
>-export_signals (DBusGConnection *connection, const GList *info_list, GObject *object)
>+export_signals (const GList *info_list, GObject *object)
> {
>   GType gtype;
>   const char *sigdata;
>@@ -2201,7 +2190,7 @@ export_signals (DBusGConnection *connection, const GList *info_list, GObject *ob
>               continue; /* FIXME: these could be listed as methods ? */
>             }
>           
>-          closure = dbus_g_signal_closure_new (connection, object, signame, (char*) iface);
>+          closure = dbus_g_signal_closure_new (object, signame, (char*) iface);
>           g_closure_set_marshal (closure, signal_emitter_marshaller);
> 
>           g_signal_connect_closure_by_id (object,
>@@ -2210,8 +2199,6 @@ export_signals (DBusGConnection *connection, const GList *info_list, GObject *ob
>                           closure,
>                           FALSE);
> 
>-          g_closure_add_finalize_notifier (closure, NULL,
>-                           dbus_g_signal_closure_finalize);
>           g_free (s);
>         }
>     }
>@@ -2602,7 +2589,7 @@ dbus_g_connection_register_g_object (DBusGConnection       *connection,
>        * on the first registration, because inside the signal marshaller
>        * we emit a signal for each registration.
>        */
>-      export_signals (connection, info_list, object);
>+      export_signals (info_list, object);
>       g_list_free (info_list);
>     }
> 
>-- 
>1.7.4.4
>

Actions: View | Splinter Review

Attachments on bug 32087: 46295 | 46296 | 46297 | 46298 | 47313

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.