[Telepathy-commits] [telepathy-mission-control/master] Add mc_account_get_connection_path()

[Alberto Mardegan]

Add a mc_account_get_connection_path() which behaves exactly as
mc_account_get_connection_name(), which was badly named.
Deprecate mc_account_get_connection_name().
---
 doc/reference/libmcclient/libmcclient-sections.txt |    1 +
 doc/reference/libmcclient/tmpl/mc-account.sgml     |    9 +++++++++
 libmcclient/mc-account.c                           |   16 ++++++++++++++--
 libmcclient/mc-account.h                           |    4 +++-
 util/mc-tool.c                                     |    2 +-
 5 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/doc/reference/libmcclient/libmcclient-sections.txt b/doc/reference/libmcclient/libmcclient-sections.txt
index 59840a6..d0ef8ae 100644
--- a/doc/reference/libmcclient/libmcclient-sections.txt
+++ b/doc/reference/libmcclient/libmcclient-sections.txt
@@ -17,6 +17,7 @@ mc_account_connects_automatically
 mc_account_get_nickname
 mc_account_get_parameters
 mc_account_get_automatic_presence
+mc_account_get_connection_path
 mc_account_get_connection_name
 mc_account_get_connection_status
 mc_account_get_connection_status_reason
diff --git a/doc/reference/libmcclient/tmpl/mc-account.sgml b/doc/reference/libmcclient/tmpl/mc-account.sgml
index 7b1afde..d2a386e 100644
--- a/doc/reference/libmcclient/tmpl/mc-account.sgml
+++ b/doc/reference/libmcclient/tmpl/mc-account.sgml
@@ -230,6 +230,15 @@ mc-account
 @message: 
 
 
+<!-- ##### FUNCTION mc_account_get_connection_path ##### -->
+<para>
+
+</para>
+
+ at account: 
+ at Returns: 
+
+
 <!-- ##### FUNCTION mc_account_get_connection_name ##### -->
 <para>
 
diff --git a/libmcclient/mc-account.c b/libmcclient/mc-account.c
index 41a9a88..502ef44 100644
--- a/libmcclient/mc-account.c
+++ b/libmcclient/mc-account.c
@@ -874,7 +874,7 @@ mc_account_get_automatic_presence (McAccount *account,
 }
 
 /**
- * mc_account_get_connection_name:
+ * mc_account_get_connection_path:
  * @account: the #McAccount.
  *
  * Returns: a constant string representing the D-Bus path of the Telepathy
@@ -883,7 +883,7 @@ mc_account_get_automatic_presence (McAccount *account,
  * calling this function.
  */
 const gchar *
-mc_account_get_connection_name (McAccount *account)
+mc_account_get_connection_path (McAccount *account)
 {
     g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
     if (G_UNLIKELY (!account->priv->props)) return NULL;
@@ -891,6 +891,18 @@ mc_account_get_connection_name (McAccount *account)
 }
 
 /**
+ * mc_account_get_connection_name:
+ * @account: the #McAccount.
+ *
+ * @deprecated: use mc_account_get_connection_path() instead.
+ */
+const gchar *
+mc_account_get_connection_name (McAccount *account)
+{
+    return mc_account_get_connection_path (account);
+}
+
+/**
  * mc_account_get_connection_status:
  * @account: the #McAccount.
  *
diff --git a/libmcclient/mc-account.h b/libmcclient/mc-account.h
index 658c419..2d01cd5 100644
--- a/libmcclient/mc-account.h
+++ b/libmcclient/mc-account.h
@@ -96,7 +96,9 @@ void mc_account_get_automatic_presence (McAccount *account,
 					TpConnectionPresenceType *type,
 					const gchar **status,
 					const gchar **message);
-const gchar *mc_account_get_connection_name (McAccount *account);
+const gchar *mc_account_get_connection_path (McAccount *account);
+const gchar *mc_account_get_connection_name (McAccount *account)
+    G_GNUC_DEPRECATED;
 TpConnectionStatus mc_account_get_connection_status (McAccount *account);
 TpConnectionStatusReason mc_account_get_connection_status_reason (McAccount *account);
 void mc_account_get_current_presence (McAccount *account,
diff --git a/util/mc-tool.c b/util/mc-tool.c
index 3864e27..885d505 100644
--- a/util/mc-tool.c
+++ b/util/mc-tool.c
@@ -576,7 +576,7 @@ command_connection (McAccount *account)
     TpConnectionStatus status;
     TpConnectionStatusReason reason;
 
-    name = mc_account_get_connection_name (account);
+    name = mc_account_get_connection_path (account);
     status = mc_account_get_connection_status (account);
     reason = mc_account_get_connection_status_reason (account);
 
-- 
1.5.6.5