Attachment 29446 Details for Bug 23297 – Only re-set registration list if it's non-empty

[patch] Only re-set registration list if it's non-empty

Only-re-set-registration-list-if-its-non-empty.patch (text/plain), 988 bytes, created by Will Thompson on 2009-09-12 04:02:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Will Thompson

Created: 2009-09-12 04:02:21 UTC

Size: 988 bytes

patch

obsolete

>From 39e2642e41b2293de7556fa15c57872f78ffcdc8 Mon Sep 17 00:00:00 2001
>From: Will Thompson <will.thompson@collabora.co.uk>
>Date: Sat, 12 Sep 2009 11:28:25 +0100
>Subject: [PATCH] Only re-set registration list if it's non-empty
>
>---
> dbus/dbus-gobject.c |    4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
>diff --git a/dbus/dbus-gobject.c b/dbus/dbus-gobject.c
>index fb41168..85574c7 100644
>--- a/dbus/dbus-gobject.c
>+++ b/dbus/dbus-gobject.c
>@@ -414,7 +414,9 @@ object_registration_free (ObjectRegistration *o)
>        */
>       registrations = g_object_steal_data (o->object, "dbus_glib_object_registrations");
>       registrations = g_slist_remove (registrations, o);
>-      g_object_set_data (o->object, "dbus_glib_object_registrations", registrations);
>+
>+      if (registrations != NULL)
>+        g_object_set_data (o->object, "dbus_glib_object_registrations", registrations);
> 
>       g_object_weak_unref (o->object, object_registration_object_died, o);
>     }
>-- 
>1.6.3.3

Actions: View | Splinter Review

Attachments on bug 23297: 28791 | 28792 | 29445 | 29446 | 29447

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.