diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-08-11 15:02:28 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-08-11 15:02:28 +0100 |
| commit | 9ac7fee1ebe17cf88d3b6b7a1847d358d502bdac (patch) | |
| tree | c0f63e1d178edffed3f592a94ed48e8244ff1d31 /telepathy-glib/base-contact-list.c | |
| parent | 9b6ef11d2cb7ca05d82497ee6e5f8ee22dc0c985 (diff) | |
| download | telepathy-glib-9ac7fee1ebe17cf88d3b6b7a1847d358d502bdac.tar.gz | |
TpBaseContactListGetStatesFunc: explicitly say that publish_request is dup'd
Also add (allow-none) to all the out parameters; as per discussion with
jdahlin on IRC yesterday, (out) (allow-none) is the "NULL to ignore"
idiom, as seen in g_file_get_contents' @length parameter.
Diffstat (limited to 'telepathy-glib/base-contact-list.c')
| -rw-r--r-- | telepathy-glib/base-contact-list.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/telepathy-glib/base-contact-list.c b/telepathy-glib/base-contact-list.c index 9a01a3505..54791078d 100644 --- a/telepathy-glib/base-contact-list.c +++ b/telepathy-glib/base-contact-list.c @@ -133,14 +133,14 @@ * TpBaseContactListGetStatesFunc: * @self: the contact list manager * @contact: the contact - * @subscribe: (out): used to return the state of the user's subscription to - * @contact's presence - * @publish: (out): used to return the state of @contact's subscription to - * the user's presence - * @publish_request: (out): if @publish will be set to %TP_SUBSCRIPTION_STATE_ASK, - * used to return the message that @contact sent when they requested - * permission to see the user's presence; otherwise, used to return an empty - * string + * @subscribe: (out) (allow-none): used to return the state of the user's + * subscription to @contact's presence + * @publish: (out) (allow-none): used to return the state of @contact's + * subscription to the user's presence + * @publish_request: (out) (allow-none) (transfer full): if @publish will be + * set to %TP_SUBSCRIPTION_STATE_ASK, used to return the message that + * @contact sent when they requested permission to see the user's presence; + * otherwise, used to return an empty string * * Signature of a virtual method to get contacts' presences. It should return * @subscribe = %TP_SUBSCRIPTION_STATE_NO, @publish = %TP_SUBSCRIPTION_STATE_NO @@ -2258,14 +2258,14 @@ tp_base_contact_list_request_subscription_finish (TpBaseContactList *self, * tp_base_contact_list_get_states: * @self: a contact list manager * @contact: the contact - * @subscribe: (out): used to return the state of the user's subscription to - * @contact's presence - * @publish: (out): used to return the state of @contact's subscription to - * the user's presence - * @publish_request: (out) (transfer full): if @publish will be set to - * %TP_SUBSCRIPTION_STATE_ASK, used to return the message that @contact sent when - * they requested permission to see the user's presence; otherwise, used to - * return an empty string + * @subscribe: (out) (allow-none): used to return the state of the user's + * subscription to @contact's presence + * @publish: (out) (allow-none): used to return the state of @contact's + * subscription to the user's presence + * @publish_request: (out) (allow-none) (transfer full): if @publish will be + * set to %TP_SUBSCRIPTION_STATE_ASK, used to return the message that + * @contact sent when they requested permission to see the user's presence; + * otherwise, used to return an empty string * * Return the presence subscription state of @contact. It is incorrect to call * this method before tp_base_contact_list_set_list_retrieved() has been |