summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2013-09-06 11:43:59 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2013-09-06 15:47:58 +0100
commit2b51b0772dbc716a50e8df0f84d3c51640834e55 (patch)
tree72b80fa63a902eac58ad8acb538d6122e249211c
parent7251b59dd4d06e55574f7a68404200253e2e2491 (diff)
downloadtelepathy-glib-2b51b0772dbc716a50e8df0f84d3c51640834e55.tar.gz
TpAccount: document interaction with factories a bit better
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54061 Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
-rw-r--r--telepathy-glib/account.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
index 23cc796ae..a342fd41d 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -73,6 +73,14 @@
* for many of the properties on this object. Refer to each property's
* documentation for whether it can be used in this way.
*
+ * #TpAccount objects should normally be obtained from the #TpAccountManager.
+ *
+ * Since 0.16, #TpAccount always has a non-%NULL #TpProxy:factory, and its
+ * #TpProxy:factory will be propagated to its #TpConnection
+ * (if any). If a #TpAccount is created without going via the
+ * #TpAccountManager or specifying a #TpProxy:factory, the default
+ * is to use a new #TpAutomaticClientFactory.
+ *
* Since: 0.7.32
*/
@@ -232,9 +240,9 @@ connection_is_internal (TpAccount *self)
* feature on a #TpAccount.
*
* When this feature is prepared, it is guaranteed that #TpAccount:connection
- * will always be either %NULL or prepared. If the account was created using a
- * #TpSimpleClientFactory, the same factory will be used to create #TpConnection
- * object and to determine desired connection features. Change notification of
+ * will always be either %NULL or prepared. The account's #TpProxy:factory
+ * will be used to create the #TpConnection object and to determine its
+ * desired connection features. Change notification of the
* #TpAccount:connection property will be delayed until all features (at least
* %TP_CONNECTION_FEATURE_CORE) are prepared. See
* tp_simple_client_factory_add_account_features() to define which features