From 04a4da8065987d7c18394a9101bd98190042198b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Wed, 26 May 2021 21:14:39 +0200 Subject: gdbusobjectmanagerclient: Move weak ref helpers upwards MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows it to be used in on_notify_g_name_owner() as well Signed-off-by: Guido Günther --- gio/gdbusobjectmanagerclient.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/gio/gdbusobjectmanagerclient.c b/gio/gdbusobjectmanagerclient.c index 88fcff4fa..80b716bc7 100644 --- a/gio/gdbusobjectmanagerclient.c +++ b/gio/gdbusobjectmanagerclient.c @@ -1244,6 +1244,21 @@ maybe_unsubscribe_signals (GDBusObjectManagerClient *manager) /* ---------------------------------------------------------------------------------------------------- */ +static GWeakRef * +weak_ref_new (GObject *object) +{ + GWeakRef *weak_ref = g_new0 (GWeakRef, 1); + g_weak_ref_init (weak_ref, object); + return g_steal_pointer (&weak_ref); +} + +static void +weak_ref_free (GWeakRef *weak_ref) +{ + g_weak_ref_clear (weak_ref); + g_free (weak_ref); +} + static void on_notify_g_name_owner (GObject *object, GParamSpec *pspec, @@ -1342,21 +1357,6 @@ on_notify_g_name_owner (GObject *object, g_object_unref (manager); } -static GWeakRef * -weak_ref_new (GObject *object) -{ - GWeakRef *weak_ref = g_new0 (GWeakRef, 1); - g_weak_ref_init (weak_ref, object); - return g_steal_pointer (&weak_ref); -} - -static void -weak_ref_free (GWeakRef *weak_ref) -{ - g_weak_ref_clear (weak_ref); - g_free (weak_ref); -} - static gboolean initable_init (GInitable *initable, GCancellable *cancellable, -- cgit v1.2.1