diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-04-01 12:20:55 +0100 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-04-01 12:20:55 +0100 |
commit | 965b7d36dd645ff88a402887ceac6f952fb12b3b (patch) | |
tree | c1ed5753e0fbd82b03e78bbdfaf168c2e1f982c3 | |
parent | a1e564f0b14cf868e61d5d3cadcf145cc82495c9 (diff) | |
download | telepathy-mission-control-965b7d36dd645ff88a402887ceac6f952fb12b3b.tar.gz |
mcd_account_manager_get_dbus_daemon: replace with mcd_account_manager_get_factory
-rw-r--r-- | src/mcd-account-manager.c | 12 | ||||
-rw-r--r-- | src/mcd-account-manager.h | 2 | ||||
-rw-r--r-- | 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 97e25452..908fe02d 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 847fef5f..ca9508e9 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 6716e108..e6ee7662 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); |