[next] telepathy-mission-control: mcd_account_manager_get_dbus_daemon: replace with mcd_account_manager_get_factory

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Apr  1 12:20:55 2014 +0100

mcd_account_manager_get_dbus_daemon: replace with mcd_account_manager_get_factory

---

 src/mcd-account-manager.c |   12 +++---------
 src/mcd-account-manager.h |    2 +-
 src/mcd-account.c         |    6 ++++--
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/mcd-account-manager.c b/src/mcd-account-manager.c
index 97e2545..908fe02 100644
--- a/src/mcd-account-manager.c
+++ b/src/mcd-account-manager.c
@@ -1699,18 +1699,12 @@ mcd_account_manager_new (TpClientFactory *client_factory)
     return MCD_ACCOUNT_MANAGER (obj);
 }
 
-/**
- * mcd_account_manager_get_dbus_daemon:
- * @account_manager: the #McdAccountManager.
- *
- * Returns: the #TpDBusDaemon.
- */
-TpDBusDaemon *
-mcd_account_manager_get_dbus_daemon (McdAccountManager *account_manager)
+TpClientFactory *
+mcd_account_manager_get_factory (McdAccountManager *account_manager)
 {
     g_return_val_if_fail (MCD_IS_ACCOUNT_MANAGER (account_manager), NULL);
 
-    return account_manager->priv->dbus_daemon;
+    return account_manager->priv->client_factory;
 }
 
 McdConnectivityMonitor *
diff --git a/src/mcd-account-manager.h b/src/mcd-account-manager.h
index 847fef5..ca9508e 100644
--- a/src/mcd-account-manager.h
+++ b/src/mcd-account-manager.h
@@ -63,7 +63,7 @@ GType mcd_account_manager_get_type (void);
 McdAccountManager *mcd_account_manager_new (
     TpClientFactory *client_factory);
 
-TpDBusDaemon *mcd_account_manager_get_dbus_daemon
+TpClientFactory *mcd_account_manager_get_factory
     (McdAccountManager *account_manager);
 
 McdAccount *mcd_account_manager_lookup_account (McdAccountManager *account_manager,
diff --git a/src/mcd-account.c b/src/mcd-account.c
index 6716e10..e6ee766 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -3455,12 +3455,14 @@ mcd_account_new (McdAccountManager *account_manager,
 {
     gpointer *obj;
     McdStorage *storage = mcd_account_manager_get_storage (account_manager);
-    TpDBusDaemon *dbus = mcd_account_manager_get_dbus_daemon (account_manager);
+    TpClientFactory *factory =
+        mcd_account_manager_get_factory (account_manager);
 
     obj = g_object_new (MCD_TYPE_ACCOUNT,
                         "storage", storage,
                         "storage-plugin", storage_plugin,
-                        "dbus-daemon", dbus,
+                        "dbus-daemon",
+                            tp_client_factory_get_dbus_daemon (factory),
                         "connectivity-monitor", connectivity,
 			"name", name,
 			NULL);