[telepathy-glib/master] account{, -manager}: show in _prepare_async documentation that @features may be NULL

Jonny Lamb jonny.lamb at collabora.co.uk
Fri Sep 25 15:02:39 PDT 2009


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

diff --git a/telepathy-glib/account-manager.c b/telepathy-glib/account-manager.c
index 0722ee2..aa160a9 100644
--- a/telepathy-glib/account-manager.c
+++ b/telepathy-glib/account-manager.c
@@ -1377,7 +1377,7 @@ tp_account_manager_is_ready (TpAccountManager *manager,
 /**
  * tp_account_manager_prepare_async:
  * @manager: a #TpAccountManager
- * @features: a 0-terminated list of features
+ * @features: a 0-terminated list of features, or %NULL
  * @callback: a callback to call when the request is satisfied
  * @user_data: data to pass to @callback
  *
@@ -1386,6 +1386,9 @@ tp_account_manager_is_ready (TpAccountManager *manager,
  * can then call tp_account_manager_prepare_finish() to get the result of the
  * operation.
  *
+ * If @features is %NULL, then @callback will be called when the implied
+ * %TP_ACCOUNT_FEATURE_CORE feature is ready.
+ *
  * If %NULL is given to @callback, then no callback will be called when the
  * operation is finished. Instead, it will simply set @features on @manager.
  * Note that if @callback is %NULL, then @user_data must also be %NULL.
diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
index aed131d..e8edae8 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -2621,7 +2621,7 @@ tp_account_is_ready (TpAccount *account,
 /**
  * tp_account_prepare_async:
  * @account: a #TpAccount
- * @features: a 0-terminated list of features
+ * @features: a 0-terminated list of features, or %NULL
  * @callback: a callback to call when the request is satisfied
  * @user_data: data to pass to @callback
  *
@@ -2630,6 +2630,9 @@ tp_account_is_ready (TpAccount *account,
  * can then call tp_account_prepare_finish() to get the result of the
  * operation.
  *
+ * If @features is %NULL, then @callback will be called when the implied
+ * %TP_ACCOUNT_FEATURE_CORE feature is ready.
+ *
  * If %NULL is given to @callback, then no callback will be called when the
  * operation is finished. Instead, it will simply set @features on @manager.
  * Note that if @callback is %NULL, then @user_data must also be %NULL.
-- 
1.5.6.5




More information about the telepathy-commits mailing list