[telepathy-glib/master] account: removed _get_unique_name

[Jonny Lamb]

Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
---
 docs/reference/telepathy-glib-sections.txt |    1 -
 telepathy-glib/account-manager.c           |    8 ++++----
 telepathy-glib/account.c                   |   28 ++++++----------------------
 telepathy-glib/account.h                   |    2 --
 4 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt
index 3e8f50c..c86eadd 100644
--- a/docs/reference/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib-sections.txt
@@ -3026,7 +3026,6 @@ tp_account_get_parameters
 tp_account_get_nickname
 tp_account_set_nickname_async
 tp_account_set_nickname_finish
-tp_account_get_unique_name
 tp_account_get_avatar_async
 tp_account_get_avatar_finish
 <SUBSECTION>
diff --git a/telepathy-glib/account-manager.c b/telepathy-glib/account-manager.c
index 406afdc..c1d212b 100644
--- a/telepathy-glib/account-manager.c
+++ b/telepathy-glib/account-manager.c
@@ -355,7 +355,7 @@ _tp_account_manager_ensure_all_accounts (TpAccountManager *manager,
             {
               name = g_ptr_array_index (accounts, i);
 
-              if (!tp_strdiff (name, tp_account_get_unique_name (account)))
+              if (!tp_strdiff (name, tp_proxy_get_object_path (account)))
                 {
                   found = TRUE;
                   break;
@@ -365,7 +365,7 @@ _tp_account_manager_ensure_all_accounts (TpAccountManager *manager,
           if (!found)
             {
               DEBUG ("Account %s was not found, remove it from the cache",
-                  tp_account_get_unique_name (account));
+                  tp_proxy_get_object_path (account));
 
               g_object_ref (account);
               g_hash_table_iter_remove (&iter);
@@ -866,7 +866,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_account_get_unique_name (account));
+      connection, tp_proxy_get_object_path (account));
 
   if (connection != NULL)
     g_signal_emit (manager, signals[NEW_CONNECTION], 0, connection);
@@ -992,7 +992,7 @@ _tp_account_manager_account_removed_cb (TpAccount *account,
 
   g_object_ref (account);
   g_hash_table_remove (priv->accounts,
-      tp_account_get_unique_name (account));
+      tp_proxy_get_object_path (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 fced861..06d33f6 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -451,7 +451,7 @@ _tp_account_connection_invalidated_cb (TpProxy *self,
     return;
 
   DEBUG ("(%s) Connection invalidated",
-      tp_account_get_unique_name (account));
+      tp_proxy_get_object_path (account));
 
   g_assert (priv->connection == TP_CONNECTION (self));
 
@@ -470,13 +470,13 @@ _tp_account_connection_ready_cb (TpConnection *connection,
   if (error != NULL)
     {
       DEBUG ("(%s) Connection failed to become ready: %s",
-          tp_account_get_unique_name (account), error->message);
+          tp_proxy_get_object_path (account), error->message);
       _tp_account_free_connection (account);
     }
   else
     {
       DEBUG ("(%s) Connection ready",
-          tp_account_get_unique_name (account));
+          tp_proxy_get_object_path (account));
       g_object_notify (G_OBJECT (account), "connection");
     }
 }
@@ -517,7 +517,7 @@ _tp_account_set_connection (TpAccount *account,
               G_CALLBACK (_tp_account_connection_invalidated_cb), account);
 
           DEBUG ("Readying connection for %s",
-              tp_account_get_unique_name (account));
+              tp_proxy_get_object_path (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);
@@ -735,7 +735,7 @@ _tp_account_got_all_cb (TpProxy *proxy,
   TpAccount *self = TP_ACCOUNT (weak_object);
 
   DEBUG ("Got whole set of properties for %s",
-      tp_account_get_unique_name (self));
+      tp_proxy_get_object_path (self));
 
   if (error != NULL)
     {
@@ -791,7 +791,7 @@ _tp_account_constructed (GObject *object)
       g_error_free (error);
     }
 
-  _tp_account_parse_object_path (tp_account_get_unique_name (self),
+  _tp_account_parse_object_path (tp_proxy_get_object_path (self),
       &(priv->proto_name), &(priv->cm_name));
 
   priv->icon_name = g_strdup_printf ("im-%s", priv->proto_name);
@@ -2422,22 +2422,6 @@ tp_account_set_nickname_async (TpAccount *account,
   g_value_unset (&value);
 }
 
-/**
- * tp_account_get_unique_name:
- * @account: a #TpAccount
- *
- * <!-- -->
- *
- * Returns: the unique name of @account
- *
- * Since: 0.7.UNRELEASED
- */
-const gchar *
-tp_account_get_unique_name (TpAccount *account)
-{
-  return tp_proxy_get_object_path (account);
-}
-
 static void
 _tp_account_got_avatar_cb (TpProxy *proxy,
     const GValue *out_Value,
diff --git a/telepathy-glib/account.h b/telepathy-glib/account.h
index d8fb52e..b4bc7dc 100644
--- a/telepathy-glib/account.h
+++ b/telepathy-glib/account.h
@@ -179,8 +179,6 @@ void tp_account_set_nickname_async (TpAccount *account,
 gboolean tp_account_set_nickname_finish (TpAccount *account,
     GAsyncResult *result, GError **error);
 
-const gchar *tp_account_get_unique_name (TpAccount *account);
-
 void tp_account_get_avatar_async (TpAccount *account,
     GAsyncReadyCallback callback, gpointer user_data);
 
-- 
1.5.6.5