diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-04-01 13:02:23 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-04-01 13:02:23 +0100 |
| commit | 0c4b02c3d10301d4f61d92cf377bd13119f599d5 (patch) | |
| tree | ad41d21ed4596c5c76de5d8adb15d969e93f7626 | |
| parent | 6571a4d08c716f07d78ab1167aaf4dbe9ff1adc9 (diff) | |
McdClientProxy: have a factory
| -rw-r--r-- | src/client-registry.c | 2 | ||||
| -rw-r--r-- | src/mcd-client-priv.h | 2 | ||||
| -rw-r--r-- | 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 65e63aea..e0925417 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 8e9bbc78..f8a68ff1 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 1cc006fa..ca690240 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, |