telepathy-mission-control: McdAccountManager: use tp_dbus_daemon_register_object

[Simon McVittie]

Module: telepathy-mission-control
Branch: master
Commit: ac8b57c149c9c84dc86427337d0b39999f96da2c
URL:    http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=ac8b57c149c9c84dc86427337d0b39999f96da2c

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri Sep 14 15:00:20 2012 +0100

McdAccountManager: use tp_dbus_daemon_register_object

dbus_g_connection_register_g_object isn't deprecated, but it's more code.

Signed-off-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=55391
Reviewed-by: Xavier Claessens <xavier.claessens at collabora.co.uk>

---

 src/mcd-account-manager.c |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/mcd-account-manager.c b/src/mcd-account-manager.c
index f1c723f..a3f2983 100644
--- a/src/mcd-account-manager.c
+++ b/src/mcd-account-manager.c
@@ -1473,14 +1473,11 @@ static void
 register_dbus_service (McdAccountManager *account_manager)
 {
     McdAccountManagerPrivate *priv = account_manager->priv;
-    DBusGConnection *dbus_connection;
     GError *error = NULL;
 
     if (priv->dbus_registered)
         return;
 
-    dbus_connection = tp_proxy_get_dbus_connection (TP_PROXY (priv->dbus_daemon));
-
     if (!tp_dbus_daemon_request_name (priv->dbus_daemon,
                                       TP_ACCOUNT_MANAGER_BUS_NAME,
                                       TRUE /* idempotent */, &error))
@@ -1495,10 +1492,9 @@ register_dbus_service (McdAccountManager *account_manager)
 
     priv->dbus_registered = TRUE;
 
-    if (G_LIKELY (dbus_connection))
-        dbus_g_connection_register_g_object (dbus_connection,
-                                             TP_ACCOUNT_MANAGER_OBJECT_PATH,
-                                             (GObject *)account_manager);
+    tp_dbus_daemon_register_object (priv->dbus_daemon,
+                                    TP_ACCOUNT_MANAGER_OBJECT_PATH,
+                                    account_manager);
 }
 
 static void