Attachment 61390 Details for Bug 49753 – 3/7] McdClientProxy, McdClientRegistry: remove now-unused string pool

[patch] 3/7] McdClientProxy, McdClientRegistry: remove now-unused string pool

0003-McdClientProxy-McdClientRegistry-remove-now-unused-s.patch (text/plain), 5.24 KB, created by Simon McVittie on 2012-05-10 12:24:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2012-05-10 12:24:50 UTC

Size: 5.24 KB

patch

obsolete

>From 7165a248547b34f5734e9ac0e7f88e1e0e0f788c Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 10 May 2012 15:34:17 +0100
>Subject: [PATCH 3/7] McdClientProxy, McdClientRegistry: remove now-unused
> string pool
>
>---
> src/client-registry.c |   12 +-----------
> src/mcd-client-priv.h |    5 +++--
> src/mcd-client.c      |   17 -----------------
> 3 files changed, 4 insertions(+), 30 deletions(-)
>
>diff --git a/src/client-registry.c b/src/client-registry.c
>index 818140b..126e671 100644
>--- a/src/client-registry.c
>+++ b/src/client-registry.c
>@@ -57,10 +57,6 @@ struct _McdClientRegistryPrivate
> 
>   TpDBusDaemon *dbus_daemon;
> 
>-  /* Not really handles as such, but TpHandleRepoIface gives us a convenient
>-   * reference-counted string pool */
>-  TpHandleRepoIface *string_pool;
>-
>   /* We don't want to start dispatching until startup has finished. This
>    * is defined as:
>    * - activatable clients have been enumerated (ListActivatableNames)
>@@ -157,8 +153,7 @@ _mcd_client_registry_found_name (McdClientRegistry *self,
>   DEBUG ("Registering client %s", well_known_name);
> 
>   client = _mcd_client_proxy_new (self->priv->dbus_daemon,
>-      self->priv->string_pool, well_known_name, unique_name_if_known,
>-      activatable);
>+      well_known_name, unique_name_if_known, activatable);
>   g_hash_table_insert (self->priv->clients, g_strdup (well_known_name),
>       client);
> 
>@@ -405,10 +400,6 @@ mcd_client_registry_constructed (GObject *object)
> 
>   tp_cli_dbus_daemon_call_list_names (self->priv->dbus_daemon, -1,
>       mcd_client_registry_list_names_cb, NULL, NULL, object);
>-
>-  /* Dummy handle type, we're just using this as a string pool */
>-  self->priv->string_pool = tp_dynamic_handle_repo_new (TP_HANDLE_TYPE_CONTACT,
>-      NULL, NULL);
> }
> 
> static void
>@@ -471,7 +462,6 @@ mcd_client_registry_dispose (GObject *object)
>     }
> 
>   tp_clear_object (&self->priv->dbus_daemon);
>-  tp_clear_object (&self->priv->string_pool);
> 
>   if (self->priv->clients != NULL)
>     {
>diff --git a/src/mcd-client-priv.h b/src/mcd-client-priv.h
>index f20f9e9..94cada4 100644
>--- a/src/mcd-client-priv.h
>+++ b/src/mcd-client-priv.h
>@@ -69,8 +69,9 @@ G_GNUC_INTERNAL GType _mcd_client_proxy_get_type (void);
>                               McdClientProxyClass))
> 
> G_GNUC_INTERNAL McdClientProxy *_mcd_client_proxy_new (
>-    TpDBusDaemon *dbus_daemon, TpHandleRepoIface *string_pool,
>-    const gchar *well_known_name, const gchar *unique_name_if_known,
>+    TpDBusDaemon *dbus_daemon,
>+    const gchar *well_known_name,
>+    const gchar *unique_name_if_known,
>     gboolean activatable);
> 
> G_GNUC_INTERNAL gboolean _mcd_client_proxy_is_ready (McdClientProxy *self);
>diff --git a/src/mcd-client.c b/src/mcd-client.c
>index 262b751..497bdaa 100644
>--- a/src/mcd-client.c
>+++ b/src/mcd-client.c
>@@ -64,7 +64,6 @@ static guint signals[N_SIGNALS] = { 0 };
> 
> struct _McdClientProxyPrivate
> {
>-    TpHandleRepoIface *string_pool;
>     GStrv capability_tokens;
> 
>     gchar *unique_name;
>@@ -1010,7 +1009,6 @@ mcd_client_proxy_dispose (GObject *object)
>                                             self);
> 
>     tp_clear_pointer (&self->priv->capability_tokens, g_strfreev);
>-    tp_clear_object (&self->priv->string_pool);
> 
>     if (chain_up != NULL)
>     {
>@@ -1086,11 +1084,6 @@ mcd_client_proxy_set_property (GObject *object,
>             self->priv->activatable = g_value_get_boolean (value);
>             break;
> 
>-        case PROP_STRING_POOL:
>-            g_assert (self->priv->string_pool == NULL);
>-            self->priv->string_pool = g_value_dup_object (value);
>-            break;
>-
>         case PROP_UNIQUE_NAME:
>             g_assert (self->priv->unique_name == NULL);
>             self->priv->unique_name = g_value_dup_string (value);
>@@ -1156,14 +1149,6 @@ _mcd_client_proxy_class_init (McdClientProxyClass *klass)
>             "TRUE if this client can be service-activated", FALSE,
>             G_PARAM_WRITABLE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
> 
>-    g_object_class_install_property (object_class, PROP_STRING_POOL,
>-        g_param_spec_object ("string-pool", "String pool",
>-            "TpHandleRepoIface used to intern strings representing capability "
>-            "tokens",
>-            G_TYPE_OBJECT,
>-            G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY |
>-            G_PARAM_STATIC_STRINGS));
>-
>     g_object_class_install_property (object_class, PROP_UNIQUE_NAME,
>         g_param_spec_string ("unique-name", "Unique name",
>             "The D-Bus unique name of this client, \"\" if not running or "
>@@ -1230,7 +1215,6 @@ _mcd_client_check_valid_name (const gchar *name_suffix,
> 
> McdClientProxy *
> _mcd_client_proxy_new (TpDBusDaemon *dbus_daemon,
>-                       TpHandleRepoIface *string_pool,
>                        const gchar *well_known_name,
>                        const gchar *unique_name_if_known,
>                        gboolean activatable)
>@@ -1255,7 +1239,6 @@ _mcd_client_proxy_new (TpDBusDaemon *dbus_daemon,
> 
>     self = g_object_new (MCD_TYPE_CLIENT_PROXY,
>                          "dbus-daemon", dbus_daemon,
>-                         "string-pool", string_pool,
>                          "object-path", object_path,
>                          "bus-name", well_known_name,
>                          "unique-name", unique_name_if_known,
>-- 
>1.7.10
>

Actions: View | Splinter Review

Attachments on bug 49753: 61388 | 61389 | 61390 | 61391 | 61392 | 61393 | 61394

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.