diff options
author | Will Thompson <will.thompson@collabora.co.uk> | 2013-04-14 11:55:14 +0100 |
---|---|---|
committer | Will Thompson <will.thompson@collabora.co.uk> | 2013-04-14 11:55:25 +0100 |
commit | f58e406cfffc1782ece080a17177271c098a1e0e (patch) | |
tree | 3e2b45ce11caab463e82782cb331fc0a235cfbf3 /telepathy-glib/account.c | |
parent | 5d5c11908eb9b6e91455416d96e41a7a636c56e5 (diff) | |
parent | 5cb65fa971d4461b1f6fc6fd79a4f5b6fff3a8cc (diff) | |
download | telepathy-glib-f58e406cfffc1782ece080a17177271c098a1e0e.tar.gz |
Merge branch 'telepathy-glib-0.20' and update NEWS
Conflicts:
NEWS
Diffstat (limited to 'telepathy-glib/account.c')
-rw-r--r-- | telepathy-glib/account.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c index 18114e05f..23cc796ae 100644 --- a/telepathy-glib/account.c +++ b/telepathy-glib/account.c @@ -2929,7 +2929,7 @@ tp_account_update_parameters_finish (TpAccount *account, * @account: a #TpAccount * @parameters: (transfer none): a variant of type %G_VARIANT_TYPE_VARDICT * containing new parameters to set on @account - * @unset_parameters: list of parameters to unset on @account + * @unset_parameters: (array zero-terminated=1): list of parameters to unset on @account * @callback: a callback to call when the request is satisfied * @user_data: data to pass to @callback * |