diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-02-09 13:30:52 +0000 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-02-09 13:30:52 +0000 |
commit | f654ace092c9a6c4aea6d00bd405f056766a5a50 (patch) | |
tree | 10fab8b14b58f2351b2fe66d24f8e60c75667504 /telepathy-glib/account-manager.c | |
parent | 8d4e7536c0720846a2d9b1789d7358a40bfac2a6 (diff) | |
parent | 10c3dda166f5dbf8f28117fbe07a4c237ac81598 (diff) | |
download | telepathy-glib-f654ace092c9a6c4aea6d00bd405f056766a5a50.tar.gz |
Merge branch 'telepathy-glib-0.16'
Conflicts:
NEWS
Diffstat (limited to 'telepathy-glib/account-manager.c')
-rw-r--r-- | telepathy-glib/account-manager.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/telepathy-glib/account-manager.c b/telepathy-glib/account-manager.c index 7d1c0a0fe..8e7ac63ca 100644 --- a/telepathy-glib/account-manager.c +++ b/telepathy-glib/account-manager.c @@ -1329,7 +1329,7 @@ tp_account_manager_create_account_async (TpAccountManager *manager, * object, with the %TP_ACCOUNT_FEATURE_CORE feature ready on it. * * The caller must keep a ref to the returned object using g_object_ref() if - * it is to be kept. + * it is to be kept beyond the lifetime of @result. * * Returns: (transfer none): a new #TpAccount which was just created on * success, otherwise %NULL |