[telepathy-glib/master] account{, -manager}: use _get_unique_name instead of _get_object_path

[Jonny Lamb]

Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
---
 telepathy-glib/account-manager.c |    8 ++++----
 telepathy-glib/account.c         |   12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/telepathy-glib/account-manager.c b/telepathy-glib/account-manager.c
index 42de60a..aabb4dc 100644
--- a/telepathy-glib/account-manager.c
+++ b/telepathy-glib/account-manager.c
@@ -198,7 +198,7 @@ _tp_account_manager_ensure_all_accounts (TpAccountManager *manager,
             {
               name = g_ptr_array_index (accounts, i);
 
-              if (!tp_strdiff (name, tp_proxy_get_object_path (account)))
+              if (!tp_strdiff (name, tp_account_get_unique_name (account)))
                 {
                   found = TRUE;
                   break;
@@ -208,7 +208,7 @@ _tp_account_manager_ensure_all_accounts (TpAccountManager *manager,
           if (!found)
             {
               DEBUG ("Account %s was not found, remove it from the cache",
-                  tp_proxy_get_object_path (account));
+                  tp_account_get_unique_name (account));
 
               g_object_ref (account);
               g_hash_table_iter_remove (&iter);
@@ -691,7 +691,7 @@ _tp_account_manager_account_connection_cb (TpAccount *account,
   TpConnection *connection = tp_account_get_connection (account);
 
   DEBUG ("Signalling connection %p of account %s",
-      connection, tp_proxy_get_object_path (account));
+      connection, tp_account_get_unique_name (account));
 
   if (connection != NULL)
     g_signal_emit (manager, signals[NEW_CONNECTION], 0, connection);
@@ -818,7 +818,7 @@ _tp_account_manager_account_removed_cb (TpAccount *account,
 
   g_object_ref (account);
   g_hash_table_remove (priv->accounts,
-      tp_proxy_get_object_path (account));
+      tp_account_get_unique_name (account));
 
   g_signal_emit (manager, signals[ACCOUNT_DELETED], 0, account);
   g_object_unref (account);
diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
index e3dd42e..2f1caa5 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -279,7 +279,7 @@ _tp_account_connection_invalidated_cb (TpProxy *self,
     return;
 
   DEBUG ("(%s) Connection invalidated",
-      tp_proxy_get_object_path (self));
+      tp_account_get_unique_name (account));
 
   g_assert (priv->connection == TP_CONNECTION (self));
 
@@ -298,13 +298,13 @@ _tp_account_connection_ready_cb (TpConnection *connection,
   if (error != NULL)
     {
       DEBUG ("(%s) Connection failed to become ready: %s",
-          tp_proxy_get_object_path (account), error->message);
+          tp_account_get_unique_name (account), error->message);
       _tp_account_free_connection (account);
     }
   else
     {
       DEBUG ("(%s) Connection ready",
-          tp_proxy_get_object_path (account));
+          tp_account_get_unique_name (account));
       g_object_notify (G_OBJECT (account), "connection");
     }
 }
@@ -345,7 +345,7 @@ _tp_account_set_connection (TpAccount *account,
               G_CALLBACK (_tp_account_connection_invalidated_cb), account);
 
           DEBUG ("Readying connection for %s",
-              tp_proxy_get_object_path (account));
+              tp_account_get_unique_name (account));
           /* notify a change in the connection property when it's ready */
           tp_connection_call_when_ready (priv->connection,
               _tp_account_connection_ready_cb, account);
@@ -580,7 +580,7 @@ _tp_account_constructed (GObject *object)
       g_error_free (error);
     }
 
-  _tp_account_parse_object_path (tp_proxy_get_object_path (self),
+  _tp_account_parse_object_path (tp_account_get_unique_name (self),
       &(priv->proto_name), &(priv->cm_name));
 
   priv->icon_name = g_strdup_printf ("im-%s", priv->proto_name);
@@ -1112,7 +1112,7 @@ _tp_account_got_all_cb (TpProxy *proxy,
   TpAccount *self = TP_ACCOUNT (weak_object);
 
   DEBUG ("Got whole set of properties for %s",
-      tp_proxy_get_object_path (proxy));
+      tp_account_get_unique_name (self));
 
   if (error != NULL)
     {
-- 
1.5.6.5