[telepathy-glib/master] account: rename _get_connection_for_path to _ensure_connection

Jonny Lamb jonny.lamb at collabora.co.uk
Fri Sep 18 07:19:47 PDT 2009


Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
---
 docs/reference/telepathy-glib-sections.txt |    2 +-
 telepathy-glib/account.c                   |   12 +++++++-----
 telepathy-glib/account.h                   |    2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt
index 1174069..c2ca5af 100644
--- a/docs/reference/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib-sections.txt
@@ -2990,7 +2990,7 @@ tp_account_new
 tp_account_init_known_interfaces
 tp_account_is_just_connected
 tp_account_get_connection
-tp_account_get_connection_for_path
+tp_account_ensure_connection
 tp_account_get_display_name
 tp_account_get_connection_manager
 tp_account_get_protocol
diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
index 1107c91..c98dc8f 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -1171,17 +1171,19 @@ tp_account_get_connection (TpAccount *account)
 }
 
 /**
- * tp_account_get_connection_for_path:
+ * tp_account_ensure_connection:
  * @account: a #TpAccount
  * @path: the path to connection object for #TpAccount
  *
- * Get the connection of the account on path. This function does not return a
- * new ref. It is not guaranteed that the returned connection object is ready
+ * Set the connection of the account by specifying the connection object path.
+ * This function does not return a new ref and it is not guaranteed that the
+ * returned #TpConnection object is ready
  *
- * Returns: the connection of the account.
+ * Returns: the connection of the account, or %NULL if either the object path
+ *   @path is invalid or it is the null-value "/"
  **/
 TpConnection *
-tp_account_get_connection_for_path (TpAccount *account,
+tp_account_ensure_connection (TpAccount *account,
     const gchar *path)
 {
   TpAccountPrivate *priv = account->priv;
diff --git a/telepathy-glib/account.h b/telepathy-glib/account.h
index 615c402..fad80d6 100644
--- a/telepathy-glib/account.h
+++ b/telepathy-glib/account.h
@@ -75,7 +75,7 @@ gboolean tp_account_is_just_connected (TpAccount *account);
 
 TpConnection *tp_account_get_connection (TpAccount *account);
 
-TpConnection *tp_account_get_connection_for_path (TpAccount *account,
+TpConnection *tp_account_ensure_connection (TpAccount *account,
     const gchar *path);
 
 const gchar *tp_account_get_display_name (TpAccount *account);
-- 
1.5.6.5




More information about the telepathy-commits mailing list