Attachment 98919 Details for Bug 77882 – base-client: don't create skeletons more than once

[patch] base-client: don't create skeletons more than once

0001-base-client-don-t-create-skeletons-more-than-once.patch (text/plain), 4.35 KB, created by Guillaume Desmottes on 2014-05-12 13:19:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guillaume Desmottes

Created: 2014-05-12 13:19:24 UTC

Size: 4.35 KB

patch

obsolete

>From bb1a903c2a3cc9c2d531398b287ac2a026696eaf Mon Sep 17 00:00:00 2001
>From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
>Date: Mon, 12 May 2014 15:17:28 +0200
>Subject: [PATCH] base-client: don't create skeletons more than once
>
>The client can be registered more than once if user manually unregister it
>first. We don't want to create different skeleton objects in that case.
>---
> telepathy-glib/base-client.c | 57 +++++++++++++++++++++++++-------------------
> 1 file changed, 33 insertions(+), 24 deletions(-)
>
>diff --git a/telepathy-glib/base-client.c b/telepathy-glib/base-client.c
>index dacf608..5996604 100644
>--- a/telepathy-glib/base-client.c
>+++ b/telepathy-glib/base-client.c
>@@ -1707,10 +1707,18 @@ observer_skeleton_init (TpBaseClient *self)
>   GDBusObjectSkeleton *skel = G_DBUS_OBJECT_SKELETON (self);
>   gboolean delay_approvers, recover;
> 
>-  self->priv->observer_skeleton = _tp_gdbus_client_observer_skeleton_new ();
>+  if (self->priv->observer_skeleton == NULL)
>+    {
>+      self->priv->observer_skeleton = _tp_gdbus_client_observer_skeleton_new ();
> 
>-  g_dbus_object_skeleton_add_interface (skel,
>-      G_DBUS_INTERFACE_SKELETON (self->priv->observer_skeleton));
>+      g_dbus_object_skeleton_add_interface (skel,
>+          G_DBUS_INTERFACE_SKELETON (self->priv->observer_skeleton));
>+
>+      /* Method */
>+      g_signal_connect_object (self->priv->observer_skeleton,
>+          "handle-observe-channel",
>+          G_CALLBACK (_tp_base_client_observe_channel), self, 0);
>+    }
> 
>   /* Properties */
>   delay_approvers = ((self->priv->flags & CLIENT_OBSERVER_DELAYS_APPROVERS)
>@@ -1726,11 +1734,6 @@ observer_skeleton_init (TpBaseClient *self)
>   _tp_gdbus_client_observer_set_observer_channel_filter (
>       self->priv->observer_skeleton,
>       g_variant_builder_end (self->priv->observer_filters));
>-
>-  /* Method */
>-  g_signal_connect_object (self->priv->observer_skeleton,
>-      "handle-observe-channel", G_CALLBACK (_tp_base_client_observe_channel),
>-      self, 0);
> }
> 
> static void
>@@ -1901,20 +1904,23 @@ approver_skeleton_init (TpBaseClient *self)
> {
>   GDBusObjectSkeleton *skel = G_DBUS_OBJECT_SKELETON (self);
> 
>-  self->priv->approver_skeleton = _tp_gdbus_client_approver_skeleton_new ();
>+  if (self->priv->approver_skeleton == NULL)
>+    {
>+      self->priv->approver_skeleton = _tp_gdbus_client_approver_skeleton_new ();
> 
>-  g_dbus_object_skeleton_add_interface (skel,
>-      G_DBUS_INTERFACE_SKELETON (self->priv->approver_skeleton));
>+      g_dbus_object_skeleton_add_interface (skel,
>+          G_DBUS_INTERFACE_SKELETON (self->priv->approver_skeleton));
>+
>+      /* Method */
>+      g_signal_connect_object (self->priv->approver_skeleton,
>+          "handle-add-dispatch-operation",
>+          G_CALLBACK (_tp_base_client_add_dispatch_operation), self, 0);
>+    }
> 
>   /* Property */
>   _tp_gdbus_client_approver_set_approver_channel_filter (
>       self->priv->approver_skeleton,
>       g_variant_builder_end (self->priv->approver_filters));
>-
>-  /* Method */
>-  g_signal_connect_object (self->priv->approver_skeleton,
>-      "handle-add-dispatch-operation",
>-      G_CALLBACK (_tp_base_client_add_dispatch_operation), self, 0);
> }
> 
> static void
>@@ -2203,10 +2209,18 @@ handler_skeleton_init (TpBaseClient *self)
>   GDBusObjectSkeleton *skel = G_DBUS_OBJECT_SKELETON (self);
>   gboolean bypass;
> 
>-  self->priv->handler_skeleton = _tp_gdbus_client_handler_skeleton_new ();
>+  if (self->priv->handler_skeleton == NULL)
>+    {
>+      self->priv->handler_skeleton = _tp_gdbus_client_handler_skeleton_new ();
> 
>-  g_dbus_object_skeleton_add_interface (skel,
>-      G_DBUS_INTERFACE_SKELETON (self->priv->handler_skeleton));
>+      g_dbus_object_skeleton_add_interface (skel,
>+          G_DBUS_INTERFACE_SKELETON (self->priv->handler_skeleton));
>+
>+      /* Method */
>+      g_signal_connect_object (self->priv->handler_skeleton,
>+          "handle-handle-channel", G_CALLBACK (_tp_base_client_handle_channel),
>+          self, 0);
>+    }
> 
>   /* Properties */
>   _tp_gdbus_client_handler_set_handler_channel_filter (
>@@ -2222,11 +2236,6 @@ handler_skeleton_init (TpBaseClient *self)
>       (const gchar * const *) self->priv->handler_caps->pdata);
> 
>   update_handled_channels_prop (self);
>-
>-  /* Method */
>-  g_signal_connect_object (self->priv->handler_skeleton,
>-      "handle-handle-channel", G_CALLBACK (_tp_base_client_handle_channel),
>-      self, 0);
> }
> 
> typedef struct
>-- 
>1.9.0
>

Actions: View | Splinter Review

Attachments on bug 77882: 98903 | 98904 | 98905 | 98906 | 98907 | 98908 | 98909 | 98910 | 98911 | 98912 | 98913 | 98919 | 99023

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.