summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2021-05-26 21:14:39 +0200
committerGuido Günther <agx@sigxcpu.org>2021-06-28 15:27:36 +0200
commit04a4da8065987d7c18394a9101bd98190042198b (patch)
tree1b7b698112b1587d378cd62328805d05c04cce44
parentd4ed69012047b703d5a3c4c7b6984708d5cf1373 (diff)
downloadglib-04a4da8065987d7c18394a9101bd98190042198b.tar.gz
gdbusobjectmanagerclient: Move weak ref helpers upwards
This allows it to be used in on_notify_g_name_owner() as well Signed-off-by: Guido Günther <agx@sigxcpu.org>
-rw-r--r--gio/gdbusobjectmanagerclient.c30
1 files 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,