Attachment 97766 Details for Bug 77774 – Make TpWeakRef use GWeakRef

[patch] Make TpWeakRef use GWeakRef

0001-Make-TpWeakRef-use-GWeakRef.patch (text/plain), 1.80 KB, created by Simon McVittie on 2014-04-22 18:27:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2014-04-22 18:27:47 UTC

Size: 1.80 KB

patch

obsolete

>From 4529d08cc28e2bde646881db3c46627d996e557a Mon Sep 17 00:00:00 2001
>From: Xavier Claessens <xavier.claessens@collabora.co.uk>
>Date: Wed, 16 Apr 2014 20:39:45 +0100
>Subject: [PATCH] Make TpWeakRef use GWeakRef
>
>---
> telepathy-glib/util.c | 15 +++++----------
> 1 file changed, 5 insertions(+), 10 deletions(-)
>
>diff --git a/telepathy-glib/util.c b/telepathy-glib/util.c
>index 3fd63d4..a3f36d7 100644
>--- a/telepathy-glib/util.c
>+++ b/telepathy-glib/util.c
>@@ -584,13 +584,13 @@ _tp_quark_array_copy (const GQuark *quarks)
>  * common in practice.
>  *
>  * If more than one piece of auxiliary data is required, the @user_data
>- * argument to the constructor can be a struct or a #GValueArray.
>+ * argument to the constructor can be a struct.
>  *
>  * Since: 0.11.3
>  */
> struct _TpWeakRef {
>     /*<private>*/
>-    gpointer object;
>+    GWeakRef object;
>     gpointer user_data;
>     GDestroyNotify destroy;
> };
>@@ -620,8 +620,7 @@ tp_weak_ref_new (gpointer object,
>   g_return_val_if_fail (G_IS_OBJECT (object), NULL);
> 
>   self = g_slice_new (TpWeakRef);
>-  self->object = object;
>-  g_object_add_weak_pointer (self->object, &self->object);
>+  g_weak_ref_init (&self->object, object);
>   self->user_data = user_data;
>   self->destroy = destroy;
>   return self;
>@@ -658,10 +657,7 @@ tp_weak_ref_get_user_data (TpWeakRef *self)
> gpointer
> tp_weak_ref_dup_object (TpWeakRef *self)
> {
>-  if (self->object != NULL)
>-    return g_object_ref (self->object);
>-
>-  return NULL;
>+  return g_weak_ref_get (&self->object);
> }
> 
> /**
>@@ -677,8 +673,7 @@ tp_weak_ref_dup_object (TpWeakRef *self)
> void
> tp_weak_ref_destroy (TpWeakRef *self)
> {
>-  if (self->object != NULL)
>-    g_object_remove_weak_pointer (self->object, &self->object);
>+  g_weak_ref_clear (&self->object);
> 
>   if (self->destroy != NULL)
>     (self->destroy) (self->user_data);
>-- 
>1.9.2
>

Actions: View | Splinter Review

Attachments on bug 77774: 97766

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.