[next] telepathy-mission-control: McdClientProxy: have a factory

[Simon McVittie]

Module: telepathy-mission-control
Branch: next
Commit: 0c4b02c3d10301d4f61d92cf377bd13119f599d5
URL:    http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=0c4b02c3d10301d4f61d92cf377bd13119f599d5

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Apr  1 13:02:23 2014 +0100

McdClientProxy: have a factory

---

 src/client-registry.c |    2 +-
 src/mcd-client-priv.h |    2 +-
 src/mcd-client.c      |    6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/client-registry.c b/src/client-registry.c
index 65e63ae..e092541 100644
--- a/src/client-registry.c
+++ b/src/client-registry.c
@@ -155,7 +155,7 @@ _mcd_client_registry_found_name (McdClientRegistry *self,
 
   DEBUG ("Registering client %s", well_known_name);
 
-  client = _mcd_client_proxy_new (self->priv->dbus_daemon,
+  client = _mcd_client_proxy_new (self->priv->factory,
       well_known_name, unique_name_if_known, activatable);
   g_hash_table_insert (self->priv->clients, g_strdup (well_known_name),
       client);
diff --git a/src/mcd-client-priv.h b/src/mcd-client-priv.h
index 8e9bbc7..f8a68ff 100644
--- a/src/mcd-client-priv.h
+++ b/src/mcd-client-priv.h
@@ -70,7 +70,7 @@ G_GNUC_INTERNAL GType _mcd_client_proxy_get_type (void);
                               McdClientProxyClass))
 
 G_GNUC_INTERNAL McdClientProxy *_mcd_client_proxy_new (
-    TpDBusDaemon *dbus_daemon,
+    TpClientFactory *factory,
     const gchar *well_known_name,
     const gchar *unique_name_if_known,
     gboolean activatable);
diff --git a/src/mcd-client.c b/src/mcd-client.c
index 1cc006f..ca69024 100644
--- a/src/mcd-client.c
+++ b/src/mcd-client.c
@@ -1215,7 +1215,7 @@ _mcd_client_check_valid_name (const gchar *name_suffix,
 }
 
 McdClientProxy *
-_mcd_client_proxy_new (TpDBusDaemon *dbus_daemon,
+_mcd_client_proxy_new (TpClientFactory *factory,
                        const gchar *well_known_name,
                        const gchar *unique_name_if_known,
                        gboolean activatable)
@@ -1239,7 +1239,9 @@ _mcd_client_proxy_new (TpDBusDaemon *dbus_daemon,
     g_assert (tp_dbus_check_valid_object_path (object_path, NULL));
 
     self = g_object_new (MCD_TYPE_CLIENT_PROXY,
-                         "dbus-daemon", dbus_daemon,
+                         "factory", factory,
+                         "dbus-daemon",
+                            tp_client_factory_get_dbus_daemon (factory),
                          "object-path", object_path,
                          "bus-name", well_known_name,
                          "unique-name", unique_name_if_known,