Attachment 99023 Details for Bug 77882 – base-client: warn if user try to add/remove iface when registered

[patch] base-client: warn if user try to add/remove iface when registered

0001-base-client-warn-if-user-try-to-add-remove-iface-whe.patch (text/plain), 1.95 KB, created by Guillaume Desmottes on 2014-05-14 09:10:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guillaume Desmottes

Created: 2014-05-14 09:10:04 UTC

Size: 1.95 KB

patch

obsolete

>From 4509d9ea86f5d0fff21774852540c6c221f3915e Mon Sep 17 00:00:00 2001
>From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
>Date: Wed, 14 May 2014 11:08:09 +0200
>Subject: [PATCH] base-client: warn if user try to add/remove iface when
> registered
>
>---
> telepathy-glib/base-client.c | 31 +++++++++++++++++++++++++++++++
> 1 file changed, 31 insertions(+)
>
>diff --git a/telepathy-glib/base-client.c b/telepathy-glib/base-client.c
>index 0491e79..e367f59 100644
>--- a/telepathy-glib/base-client.c
>+++ b/telepathy-glib/base-client.c
>@@ -1250,6 +1250,30 @@ tp_base_client_set_property (GObject *object,
>   }
> }
> 
>+/* User data for interface-added and interface-removed signals, with vaguely
>+ * mnemonic values */
>+#define INTERFACE_ADDED (GINT_TO_POINTER(1))
>+#define INTERFACE_REMOVED (GINT_TO_POINTER(-1))
>+
>+static void
>+tp_base_client_interface_changed_cb (TpBaseClient *self,
>+    GDBusInterface *interface,
>+    gpointer user_data)
>+{
>+  GDBusInterfaceInfo *info = g_dbus_interface_get_info (interface);
>+  const gchar *verb = (user_data == INTERFACE_ADDED ? "add" : "remove");
>+
>+  g_assert (user_data == INTERFACE_ADDED || user_data == INTERFACE_REMOVED);
>+
>+  if (self->priv->registered)
>+    {
>+      WARNING ("Adding or removing Client interfaces after the client "
>+          "has been registered is not supported. "
>+          "(Tried to %s %s %p, \"%s\")",
>+          verb, G_OBJECT_TYPE_NAME (interface), interface, info->name);
>+    }
>+}
>+
> static void
> tp_base_client_constructed (GObject *object)
> {
>@@ -1299,6 +1323,13 @@ tp_base_client_constructed (GObject *object)
>   g_strdelimit (self->priv->object_path, ".", '/');
> 
>   self->priv->bus_name = g_string_free (string, FALSE);
>+
>+  g_signal_connect (self, "interface-added",
>+      G_CALLBACK (tp_base_client_interface_changed_cb),
>+      INTERFACE_ADDED);
>+  g_signal_connect (self, "interface-removed",
>+      G_CALLBACK (tp_base_client_interface_changed_cb),
>+      INTERFACE_REMOVED);
> }
> 
> static void
>-- 
>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.