[libgdata] introspection: Fix introspection for GCancellable parameters

From: Philip Withnall <pwithnall src gnome org>
To: commits-list gnome org
Cc:
Subject: [libgdata] introspection: Fix introspection for GCancellable parameters
Date: Tue, 7 Jun 2011 09:42:24 +0000 (UTC)
commit 84060afb583fc5c9642861eb9ccd82488000f906
Author: P. F. Chimento <philip chimento gmail com>
Date:   Mon Jun 6 21:28:53 2011 +0200

    introspection: Fix introspection for GCancellable parameters
    
    ...and progress callbacks in non-async functions
    See bug #649728

 gdata/gdata-access-handler.c                       |    8 +++---
 gdata/gdata-batch-operation.c                      |    4 +-
 gdata/gdata-buffer.c                               |    2 +-
 gdata/gdata-client-login-authorizer.c              |    4 +-
 gdata/gdata-service.c                              |   24 ++++++++--------
 gdata/services/calendar/gdata-calendar-service.c   |   28 ++++++++++----------
 gdata/services/contacts/gdata-contacts-contact.c   |    8 +++---
 gdata/services/contacts/gdata-contacts-service.c   |   24 ++++++++--------
 gdata/services/documents/gdata-documents-service.c |   18 ++++++------
 gdata/services/picasaweb/gdata-picasaweb-service.c |   22 ++++++++--------
 gdata/services/youtube/gdata-youtube-service.c     |   28 ++++++++++----------
 11 files changed, 85 insertions(+), 85 deletions(-)
---
diff --git a/gdata/gdata-access-handler.c b/gdata/gdata-access-handler.c
index 0646393..e8e8af7 100644
--- a/gdata/gdata-access-handler.c
+++ b/gdata/gdata-access-handler.c
@@ -95,8 +95,8 @@ get_rules_thread (GSimpleAsyncResult *result, GDataAccessHandler *access_handler
  * gdata_access_handler_get_rules_async: (skip)
  * @self: a #GDataAccessHandler
  * @service: a #GDataService
- * @cancellable: optional #GCancellable object, or %NULL
- * @progress_callback: a #GDataQueryProgressCallback to call when a rule is loaded, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @progress_callback: (allow-none) (closure progress_user_data): a #GDataQueryProgressCallback to call when a rule is loaded, or %NULL
  * @progress_user_data: (closure): data to pass to the @progress_callback function
  * @callback: a #GAsyncReadyCallback to call when the query is finished
  * @user_data: (closure): data to pass to the @callback function
@@ -140,8 +140,8 @@ gdata_access_handler_get_rules_async (GDataAccessHandler *self, GDataService *se
  * gdata_access_handler_get_rules:
  * @self: a #GDataAccessHandler
  * @service: a #GDataService
- * @cancellable: optional #GCancellable object, or %NULL
- * @progress_callback: (scope call): a #GDataQueryProgressCallback to call when a rule is loaded, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @progress_callback: (allow-none) (scope call) (closure progress_user_data): a #GDataQueryProgressCallback to call when a rule is loaded, or %NULL
  * @progress_user_data: (closure): data to pass to the @progress_callback function
  * @error: a #GError, or %NULL
  *
diff --git a/gdata/gdata-batch-operation.c b/gdata/gdata-batch-operation.c
index 3bada33..1bb72c9 100644
--- a/gdata/gdata-batch-operation.c
+++ b/gdata/gdata-batch-operation.c
@@ -570,7 +570,7 @@ gdata_batch_operation_add_deletion (GDataBatchOperation *self, GDataEntry *entry
 /**
  * gdata_batch_operation_run:
  * @self: a #GDataBatchOperation
- * @cancellable: a #GCancellable, or %NULL
+ * @cancellable: (allow-none): a #GCancellable, or %NULL
  * @error: a #GError, or %NULL
  *
  * Run the #GDataBatchOperation synchronously. This will send all the operations in the batch operation to the server, and call their respective
@@ -713,7 +713,7 @@ run_thread (GSimpleAsyncResult *result, GDataBatchOperation *operation, GCancell
 /**
  * gdata_batch_operation_run_async:
  * @self: a #GDataBatchOperation
- * @cancellable: a #GCancellable, or %NULL
+ * @cancellable: (allow-none): a #GCancellable, or %NULL
  * @callback: a #GAsyncReadyCallback to call when the batch operation is finished, or %NULL
  * @user_data: (closure): data to pass to the @callback function
  *
diff --git a/gdata/gdata-buffer.c b/gdata/gdata-buffer.c
index 061c113..fe03441 100644
--- a/gdata/gdata-buffer.c
+++ b/gdata/gdata-buffer.c
@@ -175,7 +175,7 @@ pop_cancelled_cb (GCancellable *cancellable, CancelledData *data)
  * @data: return location for the popped data
  * @length_requested: the number of bytes of data requested
  * @reached_eof: return location for a value which is %TRUE when we've reached EOF, %FALSE otherwise, or %NULL
- * @cancellable: a #GCancellable, or %NULL
+ * @cancellable: (allow-none): a #GCancellable, or %NULL
  *
  * Pops up to @length_requested bytes off the head of the buffer and copies them to @data, which must be allocated by
  * the caller and have enough space to store at most @length_requested bytes of output.
diff --git a/gdata/gdata-client-login-authorizer.c b/gdata/gdata-client-login-authorizer.c
index 842d406..6e1722a 100644
--- a/gdata/gdata-client-login-authorizer.c
+++ b/gdata/gdata-client-login-authorizer.c
@@ -910,7 +910,7 @@ authenticate_thread (GSimpleAsyncResult *result, GDataClientLoginAuthorizer *aut
  * @self: a #GDataClientLoginAuthorizer
  * @username: the user's username
  * @password: the user's password
- * @cancellable: optional #GCancellable object, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
  * @callback: a #GAsyncReadyCallback to call when authentication is finished
  * @user_data: (closure): data to pass to the @callback function
  *
@@ -980,7 +980,7 @@ gdata_client_login_authorizer_authenticate_finish (GDataClientLoginAuthorizer *s
  * @self: a #GDataClientLoginAuthorizer
  * @username: the user's username
  * @password: the user's password
- * @cancellable: optional #GCancellable object, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
  * @error: a #GError, or %NULL
  *
  * Authenticates the #GDataClientLoginAuthorizer with the Google Accounts service using @username and @password and authorizes it against all the
diff --git a/gdata/gdata-service.c b/gdata/gdata-service.c
index f704cc7..66f9509 100644
--- a/gdata/gdata-service.c
+++ b/gdata/gdata-service.c
@@ -740,8 +740,8 @@ query_thread (GSimpleAsyncResult *result, GDataService *service, GCancellable *c
  * @feed_uri: the feed URI to query, including the host name and protocol
  * @query: (allow-none): a #GDataQuery with the query parameters, or %NULL
  * @entry_type: a #GType for the #GDataEntry<!-- -->s to build from the XML
- * @cancellable: optional #GCancellable object, or %NULL
- * @progress_callback: a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @progress_callback: (allow-none) (closure progress_user_data): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
  * @progress_user_data: (closure): data to pass to the @progress_callback function
  * @callback: a #GAsyncReadyCallback to call when the query is finished
  * @user_data: (closure): data to pass to the @callback function
@@ -866,8 +866,8 @@ _gdata_service_query (GDataService *self, GDataAuthorizationDomain *domain, cons
  * @feed_uri: the feed URI to query, including the host name and protocol
  * @query: (allow-none): a #GDataQuery with the query parameters, or %NULL
  * @entry_type: a #GType for the #GDataEntry<!-- -->s to build from the XML
- * @cancellable: optional #GCancellable object, or %NULL
- * @progress_callback: (scope call): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @progress_callback: (allow-none) (scope call) (closure progress_user_data): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
  * @progress_user_data: (closure): data to pass to the @progress_callback function
  * @error: a #GError, or %NULL
  *
@@ -949,7 +949,7 @@ gdata_service_query (GDataService *self, GDataAuthorizationDomain *domain, const
  * @entry_id: the entry ID of the desired entry
  * @query: (allow-none): a #GDataQuery with the query parameters, or %NULL
  * @entry_type: a #GType for the #GDataEntry to build from the XML
- * @cancellable: a #GCancellable, or %NULL
+ * @cancellable: (allow-none): a #GCancellable, or %NULL
  * @error: a #GError, or %NULL
  *
  * Retrieves information about the single entry with the given @entry_id. @entry_id should be as returned by
@@ -1046,7 +1046,7 @@ query_single_entry_thread (GSimpleAsyncResult *result, GDataService *service, GC
  * @entry_id: the entry ID of the desired entry
  * @query: (allow-none): a #GDataQuery with the query parameters, or %NULL
  * @entry_type: a #GType for the #GDataEntry to build from the XML
- * @cancellable: optional #GCancellable object, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
  * @callback: a #GAsyncReadyCallback to call when the query is finished
  * @user_data: (closure): data to pass to the @callback function
  *
@@ -1165,7 +1165,7 @@ insert_entry_thread (GSimpleAsyncResult *result, GDataService *service, GCancell
  * @domain: (allow-none): the #GDataAuthorizationDomain the insertion operation falls under, or %NULL
  * @upload_uri: the URI to which the upload should be sent
  * @entry: the #GDataEntry to insert
- * @cancellable: optional #GCancellable object, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
  * @callback: a #GAsyncReadyCallback to call when insertion is finished, or %NULL
  * @user_data: (closure): data to pass to the @callback function
  *
@@ -1243,7 +1243,7 @@ gdata_service_insert_entry_finish (GDataService *self, GAsyncResult *async_resul
  * @domain: (allow-none): the #GDataAuthorizationDomain the insertion operation falls under, or %NULL
  * @upload_uri: the URI to which the upload should be sent
  * @entry: the #GDataEntry to insert
- * @cancellable: optional #GCancellable object, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
  * @error: a #GError, or %NULL
  *
  * Inserts @entry by uploading it to the online service at @upload_uri. For more information about the concept of inserting entries, see
@@ -1363,7 +1363,7 @@ update_entry_thread (GSimpleAsyncResult *result, GDataService *service, GCancell
  * @self: a #GDataService
  * @domain: (allow-none): the #GDataAuthorizationDomain the update operation falls under, or %NULL
  * @entry: the #GDataEntry to update
- * @cancellable: optional #GCancellable object, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
  * @callback: a #GAsyncReadyCallback to call when the update is finished, or %NULL
  * @user_data: (closure): data to pass to the @callback function
  *
@@ -1438,7 +1438,7 @@ gdata_service_update_entry_finish (GDataService *self, GAsyncResult *async_resul
  * @self: a #GDataService
  * @domain: (allow-none): the #GDataAuthorizationDomain the update operation falls under, or %NULL
  * @entry: the #GDataEntry to update
- * @cancellable: optional #GCancellable object, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
  * @error: a #GError, or %NULL
  *
  * Updates @entry by PUTting it to its <literal>edit</literal> link's URI. For more information about the concept of updating entries, see
@@ -1551,7 +1551,7 @@ delete_entry_thread (GSimpleAsyncResult *result, GDataService *service, GCancell
  * @self: a #GDataService
  * @domain: (allow-none): the #GDataAuthorizationDomain the deletion falls under, or %NULL
  * @entry: the #GDataEntry to delete
- * @cancellable: optional #GCancellable object, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
  * @callback: a #GAsyncReadyCallback to call when deletion is finished, or %NULL
  * @user_data: (closure): data to pass to the @callback function
  *
@@ -1621,7 +1621,7 @@ gdata_service_delete_entry_finish (GDataService *self, GAsyncResult *async_resul
  * @self: a #GDataService
  * @domain: (allow-none): the #GDataAuthorizationDomain the deletion falls under, or %NULL
  * @entry: the #GDataEntry to delete
- * @cancellable: optional #GCancellable object, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
  * @error: a #GError, or %NULL
  *
  * Deletes @entry from the server. For more information about the concept of deleting entries, see the
diff --git a/gdata/services/calendar/gdata-calendar-service.c b/gdata/services/calendar/gdata-calendar-service.c
index 4b9acd9..e90b80f 100644
--- a/gdata/services/calendar/gdata-calendar-service.c
+++ b/gdata/services/calendar/gdata-calendar-service.c
@@ -283,8 +283,8 @@ gdata_calendar_service_get_primary_authorization_domain (void)
  * gdata_calendar_service_query_all_calendars:
  * @self: a #GDataCalendarService
  * @query: (allow-none): a #GDataQuery with the query parameters, or %NULL
- * @cancellable: optional #GCancellable object, or %NULL
- * @progress_callback: (scope call): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @progress_callback: (allow-none) (scope call) (closure progress_user_data): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
  * @progress_user_data: (closure): data to pass to the @progress_callback function
  * @error: a #GError, or %NULL
  *
@@ -328,8 +328,8 @@ gdata_calendar_service_query_all_calendars (GDataCalendarService *self, GDataQue
  * gdata_calendar_service_query_all_calendars_async: (skip)
  * @self: a #GDataCalendarService
  * @query: (allow-none): a #GDataQuery with the query parameters, or %NULL
- * @cancellable: optional #GCancellable object, or %NULL
- * @progress_callback: a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @progress_callback: (allow-none) (closure progress_user_data): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
  * @progress_user_data: (closure): data to pass to the @progress_callback function
  * @callback: a #GAsyncReadyCallback to call when authentication is finished
  * @user_data: (closure): data to pass to the @callback function
@@ -372,8 +372,8 @@ gdata_calendar_service_query_all_calendars_async (GDataCalendarService *self, GD
  * gdata_calendar_service_query_own_calendars:
  * @self: a #GDataCalendarService
  * @query: (allow-none): a #GDataQuery with the query parameters, or %NULL
- * @cancellable: optional #GCancellable object, or %NULL
- * @progress_callback: (scope call): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @progress_callback: (allow-none) (scope call) (closure progress_user_data): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
  * @progress_user_data: (closure): data to pass to the @progress_callback function
  * @error: a #GError, or %NULL
  *
@@ -417,8 +417,8 @@ gdata_calendar_service_query_own_calendars (GDataCalendarService *self, GDataQue
  * gdata_calendar_service_query_own_calendars_async: (skip)
  * @self: a #GDataCalendarService
  * @query: (allow-none): a #GDataQuery with the query parameters, or %NULL
- * @cancellable: optional #GCancellable object, or %NULL
- * @progress_callback: a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @progress_callback: (allow-none) (closure progress_user_data): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
  * @progress_user_data: (closure): data to pass to the @progress_callback function
  * @callback: a #GAsyncReadyCallback to call when authentication is finished
  * @user_data: (closure): data to pass to the @callback function
@@ -462,8 +462,8 @@ gdata_calendar_service_query_own_calendars_async (GDataCalendarService *self, GD
  * @self: a #GDataCalendarService
  * @calendar: a #GDataCalendarCalendar
  * @query: (allow-none): a #GDataQuery with the query parameters, or %NULL
- * @cancellable: optional #GCancellable object, or %NULL
- * @progress_callback: (scope call): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @progress_callback: (allow-none) (scope call) (closure progress_user_data): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
  * @progress_user_data: (closure): data to pass to the @progress_callback function
  * @error: a #GError, or %NULL
  *
@@ -512,8 +512,8 @@ gdata_calendar_service_query_events (GDataCalendarService *self, GDataCalendarCa
  * @self: a #GDataCalendarService
  * @calendar: a #GDataCalendarCalendar
  * @query: (allow-none): a #GDataQuery with the query parameters, or %NULL
- * @cancellable: optional #GCancellable object, or %NULL
- * @progress_callback: a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @progress_callback: (allow-none) (closure progress_user_data): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
  * @progress_user_data: (closure): data to pass to the @progress_callback function
  * @callback: a #GAsyncReadyCallback to call when the query is finished
  * @user_data: (closure): data to pass to the @callback function
@@ -568,7 +568,7 @@ gdata_calendar_service_query_events_async (GDataCalendarService *self, GDataCale
  * gdata_calendar_service_insert_event:
  * @self: a #GDataCalendarService
  * @event: the #GDataCalendarEvent to insert
- * @cancellable: optional #GCancellable object, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
  * @error: a #GError, or %NULL
  *
  * Inserts @event by uploading it to the online calendar service.
@@ -602,7 +602,7 @@ gdata_calendar_service_insert_event (GDataCalendarService *self, GDataCalendarEv
  * gdata_calendar_service_insert_event_async:
  * @self: a #GDataCalendarService
  * @event: the #GDataCalendarEvent to insert
- * @cancellable: optional #GCancellable object, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
  * @callback: a #GAsyncReadyCallback to call when insertion is finished
  * @user_data: (closure): data to pass to the @callback function
  *
diff --git a/gdata/services/contacts/gdata-contacts-contact.c b/gdata/services/contacts/gdata-contacts-contact.c
index 1b233f6..08dd4f9 100644
--- a/gdata/services/contacts/gdata-contacts-contact.c
+++ b/gdata/services/contacts/gdata-contacts-contact.c
@@ -3081,7 +3081,7 @@ gdata_contacts_contact_get_photo_etag (GDataContactsContact *self)
  * @service: a #GDataContactsService
  * @length: (out caller-allocates): return location for the image length, in bytes
  * @content_type: (out callee-allocates) (transfer full) (allow-none): return location for the image's content type, or %NULL; free with g_free()
- * @cancellable: optional #GCancellable object, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
  * @error: a #GError, or %NULL
  *
  * Downloads and returns the contact's photo, if they have one. If the contact doesn't
@@ -3200,7 +3200,7 @@ get_photo_thread (GSimpleAsyncResult *result, GDataContactsContact *contact, GCa
  * gdata_contacts_contact_get_photo_async:
  * @self: a #GDataContactsContact
  * @service: a #GDataContactsService
- * @cancellable: optional #GCancellable object, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
  * @callback: a #GAsyncReadyCallback to call when the photo has been retrieved, or %NULL
  * @user_data: (closure): data to pass to the @callback function
  *
@@ -3290,7 +3290,7 @@ gdata_contacts_contact_get_photo_finish (GDataContactsContact *self, GAsyncResul
  * @data: (allow-none): the image data, or %NULL
  * @length: the image length, in bytes
  * @content_type: (allow-none): the content type of the image, or %NULL
- * @cancellable: optional #GCancellable object, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
  * @error: a #GError, or %NULL
  *
  * Sets the contact's photo to @data or, if @data is %NULL, deletes the contact's photo. @content_type must be specified if @data is non-%NULL.
@@ -3392,7 +3392,7 @@ set_photo_thread (GSimpleAsyncResult *result, GDataContactsContact *contact, GCa
  * @data: (allow-none): the image data, or %NULL
  * @length: the image length, in bytes
  * @content_type: (allow-none): the content type of the image, or %NULL
- * @cancellable: optional #GCancellable object, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
  * @callback: a #GAsyncReadyCallback to call when the photo has been set, or %NULL
  * @user_data: (closure): data to pass to the @callback function
  *
diff --git a/gdata/services/contacts/gdata-contacts-service.c b/gdata/services/contacts/gdata-contacts-service.c
index 65ddac4..fa2cdd0 100644
--- a/gdata/services/contacts/gdata-contacts-service.c
+++ b/gdata/services/contacts/gdata-contacts-service.c
@@ -226,8 +226,8 @@ gdata_contacts_service_get_primary_authorization_domain (void)
  * gdata_contacts_service_query_contacts:
  * @self: a #GDataContactsService
  * @query: (allow-none): a #GDataQuery with the query parameters, or %NULL
- * @cancellable: optional #GCancellable object, or %NULL
- * @progress_callback: (scope call): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @progress_callback: (allow-none) (scope call) (closure progress_user_data): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
  * @progress_user_data: (closure): data to pass to the @progress_callback function
  * @error: a #GError, or %NULL
  *
@@ -271,8 +271,8 @@ gdata_contacts_service_query_contacts (GDataContactsService *self, GDataQuery *q
  * gdata_contacts_service_query_contacts_async: (skip)
  * @self: a #GDataContactsService
  * @query: (allow-none): a #GDataQuery with the query parameters, or %NULL
- * @cancellable: optional #GCancellable object, or %NULL
- * @progress_callback: a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @progress_callback: (allow-none) (closure progress_user_data): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
  * @progress_user_data: (closure): data to pass to the @progress_callback function
  * @callback: a #GAsyncReadyCallback to call when the query is finished
  * @user_data: (closure): data to pass to the @callback function
@@ -316,7 +316,7 @@ gdata_contacts_service_query_contacts_async (GDataContactsService *self, GDataQu
  * gdata_contacts_service_insert_contact:
  * @self: a #GDataContactsService
  * @contact: the #GDataContactsContact to insert
- * @cancellable: optional #GCancellable object, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
  * @error: a #GError, or %NULL
  *
  * Inserts @contact by uploading it to the online contacts service.
@@ -350,7 +350,7 @@ gdata_contacts_service_insert_contact (GDataContactsService *self, GDataContacts
  * gdata_contacts_service_insert_contact_async:
  * @self: a #GDataContactsService
  * @contact: the #GDataContactsContact to insert
- * @cancellable: optional #GCancellable object, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
  * @callback: a #GAsyncReadyCallback to call when insertion is finished
  * @user_data: (closure): data to pass to the @callback function
  *
@@ -385,8 +385,8 @@ gdata_contacts_service_insert_contact_async (GDataContactsService *self, GDataCo
  * gdata_contacts_service_query_groups:
  * @self: a #GDataContactsService
  * @query: (allow-none): a #GDataQuery with the query parameters, or %NULL
- * @cancellable: optional #GCancellable object, or %NULL
- * @progress_callback: (scope call): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @progress_callback: (allow-none) (scope call) (closure progress_user_data): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
  * @progress_user_data: (closure): data to pass to the @progress_callback function
  * @error: a #GError, or %NULL
  *
@@ -430,8 +430,8 @@ gdata_contacts_service_query_groups (GDataContactsService *self, GDataQuery *que
  * gdata_contacts_service_query_groups_async: (skip)
  * @self: a #GDataContactsService
  * @query: (allow-none): a #GDataQuery with the query parameters, or %NULL
- * @cancellable: optional #GCancellable object, or %NULL
- * @progress_callback: a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @progress_callback: (allow-none) (closure progress_user_data): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
  * @progress_user_data: (closure): data to pass to the @progress_callback function
  * @callback: a #GAsyncReadyCallback to call when the query is finished
  * @user_data: (closure): data to pass to the @callback function
@@ -475,7 +475,7 @@ gdata_contacts_service_query_groups_async (GDataContactsService *self, GDataQuer
  * gdata_contacts_service_insert_group:
  * @self: a #GDataContactsService
  * @group: a #GDataContactsGroup to create on the server
- * @cancellable: optional #GCancellable object, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
  * @error: a #GError, or %NULL
  *
  * Inserts a new contact group described by @group. The user must be authenticated to use this function.
@@ -520,7 +520,7 @@ gdata_contacts_service_insert_group (GDataContactsService *self, GDataContactsGr
  * gdata_contacts_service_insert_group_async:
  * @self: a #GDataContactsService
  * @group: the #GDataContactsGroup to insert
- * @cancellable: optional #GCancellable object, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
  * @callback: a #GAsyncReadyCallback to call when insertion is finished
  * @user_data: (closure): data to pass to the @callback function
  *
diff --git a/gdata/services/documents/gdata-documents-service.c b/gdata/services/documents/gdata-documents-service.c
index acef79d..c0b407e 100644
--- a/gdata/services/documents/gdata-documents-service.c
+++ b/gdata/services/documents/gdata-documents-service.c
@@ -323,8 +323,8 @@ gdata_documents_service_get_spreadsheet_authorization_domain (void)
  * gdata_documents_service_query_documents:
  * @self: a #GDataDocumentsService
  * @query: (allow-none): a #GDataDocumentsQuery with the query parameters, or %NULL
- * @cancellable: optional #GCancellable object, or %NULL
- * @progress_callback: (scope call): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @progress_callback: (allow-none) (scope call) (closure progress_user_data): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
  * @progress_user_data: (closure): data to pass to the @progress_callback function
  * @error: a #GError, or %NULL
  *
@@ -375,9 +375,9 @@ gdata_documents_service_query_documents (GDataDocumentsService *self, GDataDocum
  * gdata_documents_service_query_documents_async: (skip)
  * @self: a #GDataDocumentsService
  * @query: (allow-none): a #GDataDocumentsQuery with the query parameters, or %NULL
- * @cancellable: optional #GCancellable object, or %NULL
- * @progress_callback: a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
- * @progress_user_data: data to pass to the @progress_callback function
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @progress_callback: (allow-none) (closure progress_user_data): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
+ * @progress_user_data: (closure): data to pass to the @progress_callback function
  * @callback: a #GAsyncReadyCallback to call when authentication is finished
  * @user_data: (closure): data to pass to the @callback function
  *
@@ -622,7 +622,7 @@ gdata_documents_service_finish_upload (GDataDocumentsService *self, GDataUploadS
  * @self: an authenticated #GDataDocumentsService
  * @entry: the #GDataDocumentsEntry to move
  * @folder: the #GDataDocumentsFolder to move @entry into
- * @cancellable: optional #GCancellable object, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
  * @error: a #GError, or %NULL
  *
  * Add the given @entry to the specified @folder, and return an updated #GDataDocumentsEntry for @entry. If the @entry is already in another folder, it
@@ -734,7 +734,7 @@ add_entry_to_folder_thread (GSimpleAsyncResult *result, GDataDocumentsService *s
  * @self: a #GDataDocumentsService
  * @entry: the #GDataDocumentsEntry to add to @folder
  * @folder: the #GDataDocumentsFolder to add @entry to
- * @cancellable: optional #GCancellable object, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
  * @callback: a #GAsyncReadyCallback to call when the operation is finished, or %NULL
  * @user_data: (closure): data to pass to the @callback function
  *
@@ -809,7 +809,7 @@ gdata_documents_service_add_entry_to_folder_finish (GDataDocumentsService *self,
  * @self: a #GDataDocumentsService
  * @entry: the #GDataDocumentsEntry to remove
  * @folder: the #GDataDocumentsFolder from which we should remove @entry
- * @cancellable: optional #GCancellable object, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
  * @error: a #GError, or %NULL
  *
  * Remove the given @entry from @folder, and return an updated #GDataDocumentsEntry for @entry. @entry will remain a member of any other folders it's
@@ -934,7 +934,7 @@ remove_entry_from_folder_thread (GSimpleAsyncResult *result, GDataDocumentsServi
  * @self: a #GDataDocumentsService
  * @entry: the #GDataDocumentsEntry to remove from @folder
  * @folder: the #GDataDocumentsFolder to remove @entry from
- * @cancellable: optional #GCancellable object, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
  * @callback: a #GAsyncReadyCallback to call when the operation is finished, or %NULL
  * @user_data: (closure): data to pass to the @callback function
  *
diff --git a/gdata/services/picasaweb/gdata-picasaweb-service.c b/gdata/services/picasaweb/gdata-picasaweb-service.c
index fc555b4..9276148 100644
--- a/gdata/services/picasaweb/gdata-picasaweb-service.c
+++ b/gdata/services/picasaweb/gdata-picasaweb-service.c
@@ -218,7 +218,7 @@ create_uri (GDataPicasaWebService *self, const gchar *username, const gchar *typ
  * gdata_picasaweb_service_get_user:
  * @self: a #GDataPicasaWebService
  * @username: (allow-none): the username of the user whose information you wish to retrieve, or %NULL for the currently authenticated user.
- * @cancellable: optional #GCancellable object, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
  * @error: a #GError, or %NULL
  *
  * Queries the service to return the user specified by @username.
@@ -263,8 +263,8 @@ gdata_picasaweb_service_get_user (GDataPicasaWebService *self, const gchar *user
  * @self: a #GDataPicasaWebService
  * @query: (allow-none): a #GDataQuery with the query parameters, or %NULL
  * @username: (allow-none): the username of the user whose albums you wish to retrieve, or %NULL
- * @cancellable: optional #GCancellable object, or %NULL
- * @progress_callback: (scope call): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @progress_callback: (allow-none) (scope call) (closure progress_user_data): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
  * @progress_user_data: (closure): data to pass to the @progress_callback function
  * @error: a #GError, or %NULL
  *
@@ -319,8 +319,8 @@ gdata_picasaweb_service_query_all_albums (GDataPicasaWebService *self, GDataQuer
  * @self: a #GDataPicasaWebService
  * @query: (allow-none): a #GDataQuery with the query parameters, or %NULL
  * @username: (allow-none): the username of the user whose albums you wish to retrieve, or %NULL
- * @cancellable: optional #GCancellable object, or %NULL
- * @progress_callback: a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @progress_callback: (allow-none) (closure progress_user_data): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
  * @progress_user_data: (closure): data to pass to the @progress_callback function
  * @callback: a #GAsyncReadyCallback to call when authentication is finished
  * @user_data: (closure): data to pass to the @callback function
@@ -392,8 +392,8 @@ get_query_files_uri (GDataPicasaWebAlbum *album, GError **error)
  * @self: a #GDataPicasaWebService
  * @album: (allow-none): a #GDataPicasaWebAlbum from which to retrieve the files, or %NULL
  * @query: (allow-none): a #GDataQuery with the query parameters, or %NULL
- * @cancellable: optional #GCancellable object, or %NULL
- * @progress_callback: (scope call): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @progress_callback: (allow-none) (scope call) (closure progress_user_data): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
  * @progress_user_data: (closure): data to pass to the @progress_callback function
  * @error: a #GError, or %NULL
  *
@@ -432,8 +432,8 @@ gdata_picasaweb_service_query_files (GDataPicasaWebService *self, GDataPicasaWeb
  * @self: a #GDataPicasaWebService
  * @album: (allow-none): a #GDataPicasaWebAlbum from which to retrieve the files, or %NULL
  * @query: (allow-none): a #GDataQuery with the query parameters, or %NULL
- * @cancellable: optional #GCancellable object, or %NULL
- * @progress_callback: a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @progress_callback: (allow-none) (closure progress_user_data): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
  * @progress_user_data: (closure): data to pass to the @progress_callback function
  * @callback: a #GAsyncReadyCallback to call when the query is finished
  * @user_data: (closure): data to pass to the @callback function
@@ -583,7 +583,7 @@ gdata_picasaweb_service_finish_file_upload (GDataPicasaWebService *self, GDataUp
  * gdata_picasaweb_service_insert_album:
  * @self: a #GDataPicasaWebService
  * @album: a #GDataPicasaWebAlbum to create on the server
- * @cancellable: optional #GCancellable object, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
  * @error: a #GError, or %NULL
  *
  * Inserts a new album described by @album. A user must be
@@ -624,7 +624,7 @@ gdata_picasaweb_service_insert_album (GDataPicasaWebService *self, GDataPicasaWe
  * gdata_picasaweb_service_insert_album_async:
  * @self: a #GDataPicasaWebService
  * @album: a #GDataPicasaWebAlbum to create on the server
- * @cancellable: optional #GCancellable object, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
  * @callback: a #GAsyncReadyCallback to call when insertion is finished
  * @user_data: (closure): data to pass to the @callback function
  *
diff --git a/gdata/services/youtube/gdata-youtube-service.c b/gdata/services/youtube/gdata-youtube-service.c
index 15f2acb..db8df08 100644
--- a/gdata/services/youtube/gdata-youtube-service.c
+++ b/gdata/services/youtube/gdata-youtube-service.c
@@ -551,8 +551,8 @@ standard_feed_type_to_feed_uri (GDataYouTubeStandardFeedType feed_type)
  * @self: a #GDataYouTubeService
  * @feed_type: the feed type to query, from #GDataYouTubeStandardFeedType
  * @query: (allow-none): a #GDataQuery with the query parameters, or %NULL
- * @cancellable: optional #GCancellable object, or %NULL
- * @progress_callback: (scope call): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @progress_callback: (allow-none) (scope call) (closure progress_user_data): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
  * @progress_user_data: (closure): data to pass to the @progress_callback function
  * @error: a #GError, or %NULL
  *
@@ -582,8 +582,8 @@ gdata_youtube_service_query_standard_feed (GDataYouTubeService *self, GDataYouTu
  * @self: a #GDataService
  * @feed_type: the feed type to query, from #GDataYouTubeStandardFeedType
  * @query: (allow-none): a #GDataQuery with the query parameters, or %NULL
- * @cancellable: optional #GCancellable object, or %NULL
- * @progress_callback: a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @progress_callback: (allow-none) (closure progress_user_data): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
  * @progress_user_data: (closure): data to pass to the @progress_callback function
  * @callback: a #GAsyncReadyCallback to call when authentication is finished
  * @user_data: (closure): data to pass to the @callback function
@@ -614,8 +614,8 @@ gdata_youtube_service_query_standard_feed_async (GDataYouTubeService *self, GDat
  * gdata_youtube_service_query_videos:
  * @self: a #GDataYouTubeService
  * @query: (allow-none): a #GDataQuery with the query parameters, or %NULL
- * @cancellable: optional #GCancellable object, or %NULL
- * @progress_callback: (scope call): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @progress_callback: (allow-none) (scope call) (closure progress_user_data): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
  * @progress_user_data: (closure): data to pass to the @progress_callback function
  * @error: a #GError, or %NULL
  *
@@ -644,8 +644,8 @@ gdata_youtube_service_query_videos (GDataYouTubeService *self, GDataQuery *query
  * gdata_youtube_service_query_videos_async: (skip)
  * @self: a #GDataService
  * @query: (allow-none): a #GDataQuery with the query parameters, or %NULL
- * @cancellable: optional #GCancellable object, or %NULL
- * @progress_callback: a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @progress_callback: (allow-none) (closure progress_user_data): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
  * @progress_user_data: (closure): data to pass to the @progress_callback function
  * @callback: a #GAsyncReadyCallback to call when authentication is finished
  * @user_data: (closure): data to pass to the @callback function
@@ -677,8 +677,8 @@ gdata_youtube_service_query_videos_async (GDataYouTubeService *self, GDataQuery
  * @self: a #GDataYouTubeService
  * @video: a #GDataYouTubeVideo for which to find related videos
  * @query: (allow-none): a #GDataQuery with the query parameters, or %NULL
- * @cancellable: optional #GCancellable object, or %NULL
- * @progress_callback: (scope call): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @progress_callback: (allow-none) (scope call) (closure progress_user_data): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
  * @progress_user_data: (closure): data to pass to the @progress_callback function
  * @error: a #GError, or %NULL
  *
@@ -727,8 +727,8 @@ gdata_youtube_service_query_related (GDataYouTubeService *self, GDataYouTubeVide
  * @self: a #GDataService
  * @video: a #GDataYouTubeVideo for which to find related videos
  * @query: (allow-none): a #GDataQuery with the query parameters, or %NULL
- * @cancellable: optional #GCancellable object, or %NULL
- * @progress_callback: a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @progress_callback: (allow-none) (closure progress_user_data): a #GDataQueryProgressCallback to call when an entry is loaded, or %NULL
  * @progress_user_data: (closure): data to pass to the @progress_callback function
  * @callback: a #GAsyncReadyCallback to call when authentication is finished
  * @user_data: (closure): data to pass to the @callback function
@@ -882,7 +882,7 @@ gdata_youtube_service_get_developer_key (GDataYouTubeService *self)
 /**
  * gdata_youtube_service_get_categories:
  * @self: a #GDataYouTubeService
- * @cancellable: a #GCancellable, or %NULL
+ * @cancellable: (allow-none): a #GCancellable, or %NULL
  * @error: a #GError, or %NULL
  *
  * Gets a list of the categories currently in use on YouTube. The returned #GDataAPPCategories contains a list of #GDataYouTubeCategory<!-- -->s which
@@ -938,7 +938,7 @@ get_categories_thread (GSimpleAsyncResult *result, GDataYouTubeService *service,
 /**
  * gdata_youtube_service_get_categories_async:
  * @self: a #GDataYouTubeService
- * @cancellable: optional #GCancellable object, or %NULL
+ * @cancellable: (allow-none): optional #GCancellable object, or %NULL
  * @callback: a #GAsyncReadyCallback to call when the request is finished
  * @user_data: (closure): data to pass to the @callback function
  *
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]