[evolution-data-server] Introspection: Get rid of allow-none
- From: Corentin Noël <corentinnoel src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Introspection: Get rid of allow-none
- Date: Sat, 5 Jun 2021 18:33:25 +0000 (UTC)
commit 7ced4d67aec74a4b162697f8a087e43777861aed
Author: Corentin Noël <corentin elementary io>
Date: Sat Jun 5 20:31:38 2021 +0200
Introspection: Get rid of allow-none
Use either nullable or optional depending on the context.
Fix several introspection issues at the same time.
src/addressbook/libebook-contacts/e-contact.c | 14 +-
src/addressbook/libebook-contacts/e-phone-number.c | 20 +--
src/addressbook/libebook-contacts/e-vcard.c | 22 +--
src/addressbook/libebook/e-book-client-cursor.c | 38 ++---
src/addressbook/libebook/e-book-client-view.c | 22 ++-
src/addressbook/libebook/e-book-client.c | 110 +++++++-------
src/addressbook/libebook/e-book-utils.c | 2 +-
src/addressbook/libebook/e-book.c | 9 +-
src/addressbook/libebook/e-destination.c | 6 +-
.../libedata-book/e-book-backend-sqlitedb.c | 94 ++++++------
src/addressbook/libedata-book/e-book-sqlite.c | 112 +++++++-------
src/addressbook/libedata-book/e-data-book-cursor.c | 28 ++--
src/addressbook/libedata-book/e-data-book-cursor.h | 22 +--
src/addressbook/libedata-book/e-data-book.c | 16 +-
src/calendar/libecal/e-cal-client.c | 168 ++++++++++-----------
src/calendar/libecal/e-cal-recur.c | 2 +-
src/libebackend/e-backend.c | 18 +--
src/libebackend/e-user-prompter-server-extension.c | 4 +-
src/libebackend/e-user-prompter-server.c | 2 +-
src/libebackend/e-user-prompter.c | 46 +++---
src/libedataserver/e-cancellable-locks.c | 4 +-
src/libedataserver/e-client.c | 42 +++---
src/libedataserver/e-collator.c | 20 +--
src/libedataserver/e-data-server-util.c | 60 ++++----
src/libedataserver/e-source-alarms.c | 2 +-
src/libedataserver/e-source-authentication.c | 26 ++--
src/libedataserver/e-source-backend.c | 6 +-
src/libedataserver/e-source-collection.c | 10 +-
.../e-source-credentials-provider-impl.c | 12 +-
src/libedataserver/e-source-goa.c | 26 ++--
src/libedataserver/e-source-mail-account.c | 12 +-
src/libedataserver/e-source-mail-composition.c | 14 +-
src/libedataserver/e-source-mail-identity.c | 36 ++---
src/libedataserver/e-source-mail-signature.c | 33 ++--
src/libedataserver/e-source-mail-submission.c | 12 +-
src/libedataserver/e-source-proxy.c | 9 +-
src/libedataserver/e-source-refresh.c | 4 +-
src/libedataserver/e-source-registry.c | 62 ++++----
src/libedataserver/e-source-resource.c | 6 +-
src/libedataserver/e-source-security.c | 2 +-
src/libedataserver/e-source-smime.c | 18 +--
src/libedataserver/e-source-webdav.c | 34 ++---
src/libedataserver/e-source.c | 114 +++++++-------
src/libedataserver/e-webdav-discover.c | 50 +++---
src/libedataserverui/e-credentials-prompter-impl.c | 6 +-
src/libedataserverui/e-credentials-prompter.c | 20 +--
src/libedataserverui/e-trust-prompt.c | 10 +-
src/libedataserverui/e-webdav-discover-widget.c | 19 ++-
48 files changed, 712 insertions(+), 712 deletions(-)
---
diff --git a/src/addressbook/libebook-contacts/e-contact.c b/src/addressbook/libebook-contacts/e-contact.c
index 54f14fd84..8c3d105f1 100644
--- a/src/addressbook/libebook-contacts/e-contact.c
+++ b/src/addressbook/libebook-contacts/e-contact.c
@@ -1792,7 +1792,7 @@ e_contact_field_id_from_vcard (const gchar *vcard_field)
*
* Gets the value of @contact's field specified by @field_id.
*
- * Returns: (transfer full) (allow-none): Depends on the field's type, owned by the caller. This may be
%NULL if the field isn't set.
+ * Returns: (transfer full) (nullable): Depends on the field's type, owned by the caller. This may be %NULL
if the field isn't set.
**/
gpointer
e_contact_get (EContact *contact,
@@ -2068,7 +2068,7 @@ e_contact_get_attributes (EContact *contact,
/**
* e_contact_get_attributes_set:
* @contact: an #EContact
- * @field_ids: an array of #EContactField
+ * @field_ids: (array length=size): an array of #EContactField
* @size: number of elements in field_ids
*
* Gets a list of the vcard attributes for @contact's @field_ids.
@@ -2293,7 +2293,7 @@ E_CONTACT_DEFINE_BOXED_TYPE (e_contact_name, "EContactName")
*
* Creates a new #EContactDate based on @str.
*
- * Returns: A new #EContactDate struct.
+ * Returns: (transfer full): A new #EContactDate struct.
**/
EContactDate *
e_contact_date_from_string (const gchar *str)
@@ -2502,11 +2502,11 @@ e_contact_photo_copy (EContactPhoto *photo)
/**
* e_contact_photo_get_inlined:
* @photo: an #EContactPhoto
- * @len: (out caller-allocates) (transfer none): the length of the inlined data
+ * @len: (out): the length of the inlined data
*
* Gets the @photo's data.
*
- * Returns: (transfer none) (array length=len) (allow-none): the inlined image in the
+ * Returns: (transfer none) (array length=len) (nullable): the inlined image in the
* #EContactPhoto, or %NULL if it has not been set.
*
* Since: 3.2
@@ -2551,7 +2551,7 @@ e_contact_photo_set_inlined (EContactPhoto *photo,
*
* Gets the @photo's mime type.
*
- * Returns: (transfer none) (allow-none): the MIME type of the image, or %NULL if it has not been set.
+ * Returns: (transfer none) (nullable): the MIME type of the image, or %NULL if it has not been set.
*
* Since: 3.2
**/
@@ -2590,7 +2590,7 @@ e_contact_photo_set_mime_type (EContactPhoto *photo,
*
* Gets the @photo's URI.
*
- * Returns: (transfer none) (allow-none): the URI of the image, or %NULL if it has not been set
+ * Returns: (transfer none) (nullable): the URI of the image, or %NULL if it has not been set
*
* Since: 3.2
**/
diff --git a/src/addressbook/libebook-contacts/e-phone-number.c
b/src/addressbook/libebook-contacts/e-phone-number.c
index 88d6807fb..188c7af75 100644
--- a/src/addressbook/libebook-contacts/e-phone-number.c
+++ b/src/addressbook/libebook-contacts/e-phone-number.c
@@ -90,9 +90,9 @@ e_phone_number_is_supported (void)
/**
* e_phone_number_get_country_code_for_region:
- * @region_code: (allow-none): a two-letter country code, a locale name, or
+ * @region_code: (nullable): a two-letter country code, a locale name, or
* %NULL
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Retrieves the preferred country calling code for @region_code,
* e.g. 358 for "fi" or 1 for "en_US@UTF-8".
@@ -123,7 +123,7 @@ e_phone_number_get_country_code_for_region (const gchar *region_code,
/**
* e_phone_number_get_default_region:
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Retrieves the current two-letter country code that's used by default for
* parsing phone numbers in e_phone_number_from_string(). It can be useful
@@ -134,7 +134,7 @@ e_phone_number_get_country_code_for_region (const gchar *region_code,
* for %_NL_ADDRESS_COUNTRY_AB2 this value is returned. Otherwise the
* locale name configured for %LC_ADDRESS is parsed.
*
- * Returns: (transfer full): a newly allocated string containing the
+ * Returns: a newly allocated string containing the
* current locale's two-letter code for phone number parsing.
*
* Since: 3.8
@@ -157,8 +157,8 @@ e_phone_number_get_default_region (GError **error)
/**
* e_phone_number_from_string:
* @phone_number: the phone number to parse
- * @region_code: (allow-none): a two-letter country code, or %NULL
- * @error: (out): a #GError to set an error, if any
+ * @region_code: (nullable): a two-letter country code, or %NULL
+ * @error: a #GError to set an error, if any
*
* Parses the string passed in @phone_number. Note that no validation is
* performed whether the recognized phone number is valid for a particular
@@ -227,7 +227,7 @@ e_phone_number_to_string (const EPhoneNumber *phone_number,
/**
* e_phone_number_get_country_code:
* @phone_number: the phone number to query
- * @source: an optional location for storing the phone number's origin, or %NULL
+ * @source: (nullable): an optional location for storing the phone number's origin, or %NULL
*
* Queries the @phone_number's country calling code and optionally stores the country
* calling code's origin in @source. For instance when parsing "+1-617-5423789" this
@@ -320,7 +320,7 @@ e_phone_number_compare (const EPhoneNumber *first_number,
* e_phone_number_compare_strings:
* @first_number: the first EPhoneNumber to compare
* @second_number: the second EPhoneNumber to compare
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Compares two phone numbers.
*
@@ -341,8 +341,8 @@ e_phone_number_compare_strings (const gchar *first_number,
* e_phone_number_compare_strings_with_region:
* @first_number: the first EPhoneNumber to compare
* @second_number: the second EPhoneNumber to compare
- * @region_code: (allow-none): a two-letter country code, or %NULL
- * @error: (out): a #GError to set an error, if any
+ * @region_code: (nullable): a two-letter country code, or %NULL
+ * @error: a #GError to set an error, if any
*
* Compares two phone numbers within the context of @region_code.
*
diff --git a/src/addressbook/libebook-contacts/e-vcard.c b/src/addressbook/libebook-contacts/e-vcard.c
index 6c971e50c..d2898b13b 100644
--- a/src/addressbook/libebook-contacts/e-vcard.c
+++ b/src/addressbook/libebook-contacts/e-vcard.c
@@ -1038,7 +1038,7 @@ e_vcard_construct (EVCard *evc,
* e_vcard_construct_with_uid:
* @evc: an existing #EVCard
* @str: a vCard string
- * @uid: (allow-none): a unique ID string
+ * @uid: (nullable): a unique ID string
*
* Constructs the existing #EVCard, @evc, setting its vCard data to @str, and
* adding a new UID attribute with the value given in @uid (if @uid is
@@ -1061,7 +1061,7 @@ e_vcard_construct_with_uid (EVCard *evc,
* @evc: an existing #EVCard
* @str: a vCard string
* @len: length of @str, or -1 if @str is %NULL terminated
- * @uid: (allow-none): a unique ID string
+ * @uid: (nullable): a unique ID string
*
* Similar to e_vcard_construct_with_uid(), but can also
* be used with an @str that is not %NULL terminated.
@@ -1619,7 +1619,7 @@ e_vcard_dump_structure (EVCard *evc)
/**
* e_vcard_attribute_new:
- * @attr_group: (allow-none): a group name
+ * @attr_group: (nullable): a group name
* @attr_name: an attribute name
*
* Creates a new #EVCardAttribute with the specified group and
@@ -1706,7 +1706,7 @@ e_vcard_attribute_copy (EVCardAttribute *attr)
/**
* e_vcard_remove_attributes:
* @evc: vcard object
- * @attr_group: (allow-none): group name of attributes to be removed
+ * @attr_group: (nullable): group name of attributes to be removed
* @attr_name: name of the arributes to be removed
*
* Removes all the attributes with group name and attribute name equal to the
@@ -2523,7 +2523,7 @@ e_vcard_get_attributes (EVCard *evcard)
* is more efficient to iterate once over the list returned by
* e_vcard_get_attributes().</para></note>
*
- * Returns: (transfer none) (allow-none): An #EVCardAttribute if found, or %NULL.
+ * Returns: (transfer none) (nullable): An #EVCardAttribute if found, or %NULL.
**/
EVCardAttribute *
e_vcard_get_attribute (EVCard *evc,
@@ -2562,7 +2562,7 @@ e_vcard_get_attribute (EVCard *evc,
* Similar to e_vcard_get_attribute() but this method will not attempt to
* parse the vCard if it is not already parsed.
*
- * Returns: (transfer none) (allow-none): An #EVCardAttribute if found, or %NULL.
+ * Returns: (transfer none) (nullable): An #EVCardAttribute if found, or %NULL.
*
* Since: 3.4
**/
@@ -2591,7 +2591,7 @@ e_vcard_get_attribute_if_parsed (EVCard *evc,
*
* Gets the group name of @attr.
*
- * Returns: (allow-none): The attribute's group name, or %NULL.
+ * Returns: (nullable): The attribute's group name, or %NULL.
**/
const gchar *
e_vcard_attribute_get_group (EVCardAttribute *attr)
@@ -2733,7 +2733,7 @@ e_vcard_attribute_is_single_valued (EVCardAttribute *attr)
* single-valued (i.e. for which e_vcard_attribute_is_single_valued() returns
* %FALSE). Use e_vcard_attribute_get_values() in such cases instead.
*
- * Returns: (allow-none) (transfer full): A newly allocated string representing
+ * Returns: (nullable): A newly allocated string representing
* the value, or %NULL if the attribute has no value.
**/
gchar *
@@ -2763,7 +2763,7 @@ e_vcard_attribute_get_value (EVCardAttribute *attr)
* single-valued (i.e. for which e_vcard_attribute_is_single_valued() returns
* %FALSE). Use e_vcard_attribute_get_values_decoded() in such cases instead.
*
- * Returns: (allow-none) (transfer full): A newly allocated #GString
+ * Returns: (nullable) (transfer full): A newly allocated #GString
* representing the value, or %NULL if the attribute has no value.
**/
GString *
@@ -2864,7 +2864,7 @@ e_vcard_attribute_get_params (EVCardAttribute *attr)
* contents are owned by @attr, and must not be freed. If no parameter with the
* given @name exists, %NULL is returned.
*
- * Returns: (transfer none) (element-type utf8) (allow-none): A list of string
+ * Returns: (transfer none) (element-type utf8) (nullable): A list of string
* elements representing the parameter's values, or %NULL.
**/
GList *
@@ -2998,7 +2998,7 @@ e_vcard_util_set_x_attribute (EVCard *vcard,
* @vcard: an #EVCard
* @x_name: the attribute name, which starts with "X-"
*
- * Returns: (nullable) (transfer full): Value of attribute @x_name, or %NULL,
+ * Returns: (nullable): Value of attribute @x_name, or %NULL,
* when there is no such attribute. Free the returned pointer with g_free(),
* when no longer needed.
*
diff --git a/src/addressbook/libebook/e-book-client-cursor.c b/src/addressbook/libebook/e-book-client-cursor.c
index 519ab405d..acfb0ae2b 100644
--- a/src/addressbook/libebook/e-book-client-cursor.c
+++ b/src/addressbook/libebook/e-book-client-cursor.c
@@ -2151,7 +2151,7 @@ alphabet_index_thread (GSimpleAsyncResult *simple,
*
* Unreference the #EBookClient with g_object_unref() when finished with it.
*
- * Returns: (transfer full): an #EBookClient
+ * Returns: (transfer full) (type EBookClient): an #EBookClient
*
* Since: 3.12
*/
@@ -2166,10 +2166,10 @@ e_book_client_cursor_ref_client (EBookClientCursor *cursor)
/**
* e_book_client_cursor_get_alphabet:
* @cursor: an #EBookClientCursor
- * @n_labels: (out) (allow-none): The number of labels in the active alphabet
- * @underflow: (allow-none) (out): The underflow index, for any words which sort below the active alphabet
- * @inflow: (allow-none) (out): The inflow index, for any words which sort between the active alphabets (if
there is more than one)
- * @overflow: (allow-none) (out): The overflow index, for any words which sort above the active alphabet
+ * @n_labels: (out) (optional): The number of labels in the active alphabet
+ * @underflow: (optional) (out): The underflow index, for any words which sort below the active alphabet
+ * @inflow: (optional) (out): The inflow index, for any words which sort between the active alphabets (if
there is more than one)
+ * @overflow: (optional) (out): The overflow index, for any words which sort above the active alphabet
*
* Fetches the array of displayable labels for the <link linkend="cursor-alphabet">active alphabet</link>.
*
@@ -2267,7 +2267,7 @@ e_book_client_cursor_get_position (EBookClientCursor *cursor)
* e_book_client_cursor_set_sexp:
* @cursor: an #EBookClientCursor
* @sexp: the new search expression for @cursor
- * @cancellable: (allow-none): a #GCancellable to optionally cancel this operation while in progress
+ * @cancellable: a #GCancellable to optionally cancel this operation while in progress
* @callback: callback to call when a result is ready
* @user_data: user data for the @callback
*
@@ -2316,7 +2316,7 @@ e_book_client_cursor_set_sexp (EBookClientCursor *cursor,
* e_book_client_cursor_set_sexp_finish:
* @cursor: an #EBookClientCursor
* @result: a #GAsyncResult
- * @error: (out) (allow-none): return location for a #GError, or %NULL
+ * @error: return location for a #GError, or %NULL
*
* Completes an asynchronous call initiated by e_book_client_cursor_set_sexp(), reporting
* whether the new search expression was accepted.
@@ -2361,8 +2361,8 @@ e_book_client_cursor_set_sexp_finish (EBookClientCursor *cursor,
* e_book_client_cursor_set_sexp_sync:
* @cursor: an #EBookClientCursor
* @sexp: the new search expression for @cursor
- * @cancellable: (allow-none): a #GCancellable to optionally cancel this operation while in progress
- * @error: (out) (allow-none): return location for a #GError, or %NULL
+ * @cancellable: a #GCancellable to optionally cancel this operation while in progress
+ * @error: return location for a #GError, or %NULL
*
* Sets the <link linkend="cursor-search">Search Expression</link> for the cursor.
*
@@ -2422,7 +2422,7 @@ e_book_client_cursor_set_sexp_sync (EBookClientCursor *cursor,
* @flags: The #EBookCursorStepFlags for this step
* @origin: The #EBookCursorOrigin from whence to step
* @count: a positive or negative amount of contacts to try and fetch
- * @cancellable: (allow-none): a #GCancellable to optionally cancel this operation while in progress
+ * @cancellable: a #GCancellable to optionally cancel this operation while in progress
* @callback: callback to call when a result is ready
* @user_data: user data for the @callback
*
@@ -2475,8 +2475,8 @@ e_book_client_cursor_step (EBookClientCursor *cursor,
* e_book_client_cursor_step_finish:
* @cursor: an #EBookClientCursor
* @result: a #GAsyncResult
- * @out_contacts: (element-type EContact) (out) (transfer full) (allow-none): return location for a #GSList
of #EContact
- * @error: (out) (allow-none): return location for a #GError, or %NULL
+ * @out_contacts: (element-type EContact) (out) (transfer full) (optional): return location for a #GSList of
#EContact
+ * @error: return location for a #GError, or %NULL
*
* Completes an asynchronous call initiated by e_book_client_cursor_step(), fetching
* any contacts which might have been returned by the call.
@@ -2530,9 +2530,9 @@ e_book_client_cursor_step_finish (EBookClientCursor *cursor,
* @flags: The #EBookCursorStepFlags for this step
* @origin: The #EBookCursorOrigin from whence to step
* @count: a positive or negative amount of contacts to try and fetch
- * @out_contacts: (element-type EContact) (out) (transfer full) (allow-none): return location for a #GSList
of #EContact
- * @cancellable: (allow-none): a #GCancellable to optionally cancel this operation while in progress
- * @error: (out) (allow-none): return location for a #GError, or %NULL
+ * @out_contacts: (element-type EContact) (out) (transfer full) (optional): return location for a #GSList of
#EContact
+ * @cancellable: a #GCancellable to optionally cancel this operation while in progress
+ * @error: return location for a #GError, or %NULL
*
* <link linkend="cursor-iteration">Steps the cursor through the results</link> by
* a maximum of @count and fetch the results traversed.
@@ -2607,7 +2607,7 @@ e_book_client_cursor_step_sync (EBookClientCursor *cursor,
* e_book_client_cursor_set_alphabetic_index:
* @cursor: an #EBookClientCursor
* @index: the alphabetic index
- * @cancellable: (allow-none): a #GCancellable to optionally cancel this operation while in progress
+ * @cancellable: a #GCancellable to optionally cancel this operation while in progress
* @callback: callback to call when a result is ready
* @user_data: user data for the @callback
*
@@ -2656,7 +2656,7 @@ e_book_client_cursor_set_alphabetic_index (EBookClientCursor *cursor,
* e_book_client_cursor_set_alphabetic_index_finish:
* @cursor: an #EBookClientCursor
* @result: a #GAsyncResult
- * @error: (out) (allow-none): return location for a #GError, or %NULL
+ * @error: return location for a #GError, or %NULL
*
* Completes an asynchronous call initiated by e_book_client_cursor_set_alphabetic_index().
*
@@ -2700,8 +2700,8 @@ e_book_client_cursor_set_alphabetic_index_finish (EBookClientCursor *cursor,
* e_book_client_cursor_set_alphabetic_index_sync:
* @cursor: an #EBookClientCursor
* @index: the alphabetic index
- * @cancellable: (allow-none): a #GCancellable to optionally cancel this operation while in progress
- * @error: (out) (allow-none): return location for a #GError, or %NULL
+ * @cancellable: a #GCancellable to optionally cancel this operation while in progress
+ * @error: return location for a #GError, or %NULL
*
* Sets the cursor to point to an <link linkend="cursor-alphabet">Alphabetic Index</link>.
*
diff --git a/src/addressbook/libebook/e-book-client-view.c b/src/addressbook/libebook/e-book-client-view.c
index 368d33dcf..62b06d548 100644
--- a/src/addressbook/libebook/e-book-client-view.c
+++ b/src/addressbook/libebook/e-book-client-view.c
@@ -983,6 +983,12 @@ e_book_client_view_class_init (EBookClientViewClass *class)
G_PARAM_CONSTRUCT_ONLY |
G_PARAM_STATIC_STRINGS));
+ /**
+ * EBookClientView::objects-added:
+ * @client_view: the #EBookClientView which emitted the signal
+ * @objects: (type GSList) (transfer none) (element-type EContact): a #GSList
+ * of added #EContact objects into the @client_view.
+ */
signals[OBJECTS_ADDED] = g_signal_new (
"objects-added",
G_OBJECT_CLASS_TYPE (object_class),
@@ -992,6 +998,12 @@ e_book_client_view_class_init (EBookClientViewClass *class)
G_TYPE_NONE, 1,
G_TYPE_POINTER);
+ /**
+ * EBookClientView::objects-modified:
+ * @client_view: the #EBookClientView which emitted the signal
+ * @objects: (type GSList) (transfer none) (element-type EContact): a #GSList
+ * of modified #EContact objects within the @client_view
+ */
signals[OBJECTS_MODIFIED] = g_signal_new (
"objects-modified",
G_OBJECT_CLASS_TYPE (object_class),
@@ -1001,6 +1013,12 @@ e_book_client_view_class_init (EBookClientViewClass *class)
G_TYPE_NONE, 1,
G_TYPE_POINTER);
+ /**
+ * EBookClientView::objects-removed:
+ * @client_view: the #EBookClientView which emitted the signal
+ * @uids: (type GSList) (transfer none) (element-type utf8): a #GSList
+ * of removed objects, described by their UID.
+ */
signals[OBJECTS_REMOVED] = g_signal_new (
"objects-removed",
G_OBJECT_CLASS_TYPE (object_class),
@@ -1054,7 +1072,7 @@ e_book_client_view_init (EBookClientView *client_view)
* The returned #EBookClient is referenced for thread-safety. Unreference
* the #EBookClient with g_object_unref() when finished with it.
*
- * Returns: (transfer full): an #EBookClient
+ * Returns: (transfer full) (type EBookClient): an #EBookClient
*
* Since: 3.10
**/
@@ -1075,7 +1093,7 @@ e_book_client_view_ref_client (EBookClientView *client_view)
*
* Returns the #EBookClientView:client associated with @client_view.
*
- * Returns: (transfer none): an #EBookClient
+ * Returns: (transfer none) (type EBookClient): an #EBookClient
*
* Deprecated: 3.10: Use e_book_client_view_ref_client() instead.
**/
diff --git a/src/addressbook/libebook/e-book-client.c b/src/addressbook/libebook/e-book-client.c
index 709bc52fd..7265dd5e2 100644
--- a/src/addressbook/libebook/e-book-client.c
+++ b/src/addressbook/libebook/e-book-client.c
@@ -1315,7 +1315,7 @@ e_book_client_init (EBookClient *client)
* e_book_client_connect_sync:
* @source: an #ESource
* @wait_for_connected_seconds: timeout, in seconds, to wait for the backend to be fully connected
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
* @error: return location for a #GError, or %NULL
*
* Creates a new #EBookClient for @source. If an error occurs, the function
@@ -1501,10 +1501,9 @@ exit:
* e_book_client_connect:
* @source: an #ESource
* @wait_for_connected_seconds: timeout, in seconds, to wait for the backend to be fully connected
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request
- * is satisfied
- * @user_data: (closure): data to pass to the callback function
+ * @cancellable: optional #GCancellable object, or %NULL
+ * @callback: a #GAsyncReadyCallback to call when the request is satisfied
+ * @user_data: data to pass to the callback function
*
* Asynchronously creates a new #EBookClient for @source.
*
@@ -1711,7 +1710,7 @@ connect_direct (EBookClient *client,
* @registry: an #ESourceRegistry
* @source: an #ESource
* @wait_for_connected_seconds: timeout, in seconds, to wait for the backend to be fully connected
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
* @error: return location for a #GError, or %NULL
*
* Like e_book_client_connect_sync(), except creates the book client for
@@ -1790,10 +1789,9 @@ exit:
* e_book_client_connect_direct:
* @source: an #ESource
* @wait_for_connected_seconds: timeout, in seconds, to wait for the backend to be fully connected
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request
- * is satisfied
- * @user_data: (closure): data to pass to the callback function
+ * @cancellable: optional #GCancellable object, or %NULL
+ * @callback: a #GAsyncReadyCallback to call when the request is satisfied
+ * @user_data: data to pass to the callback function
*
* Like e_book_client_connect(), except creates the book client for
* direct read access to the underlying addressbook.
@@ -2132,7 +2130,7 @@ book_client_add_contact_thread (GSimpleAsyncResult *simple,
* e_book_client_add_contact:
* @client: an #EBookClient
* @contact: an #EContact
- * @opflags: bit-or of #EBookOperationFlags
+ * @opflags: (type EBookOperationFlags): bit-or of #EBookOperationFlags
* @cancellable: a #GCancellable; can be %NULL
* @callback: callback to call when a result is ready
* @user_data: user data for the @callback
@@ -2181,8 +2179,8 @@ e_book_client_add_contact (EBookClient *client,
* e_book_client_add_contact_finish:
* @client: an #EBookClient
* @result: a #GAsyncResult
- * @out_added_uid: (out): UID of a newly added contact; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @out_added_uid: (out) (optional): UID of a newly added contact; can be %NULL
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_book_client_add_contact() and
* sets @out_added_uid to a UID of a newly added contact.
@@ -2228,10 +2226,10 @@ e_book_client_add_contact_finish (EBookClient *client,
* e_book_client_add_contact_sync:
* @client: an #EBookClient
* @contact: an #EContact
- * @opflags: bit-or of #EBookOperationFlags
- * @out_added_uid: (out): UID of a newly added contact; can be %NULL
+ * @opflags: (type EBookOperationFlags): bit-or of #EBookOperationFlags
+ * @out_added_uid: (out) (optional): UID of a newly added contact; can be %NULL
* @cancellable: a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Adds @contact to @client and
* sets @out_added_uid to a UID of a newly added contact.
@@ -2310,8 +2308,8 @@ book_client_add_contacts_thread (GSimpleAsyncResult *simple,
* e_book_client_add_contacts:
* @client: an #EBookClient
* @contacts: (element-type EContact): a #GSList of #EContact objects to add
- * @opflags: bit-or of #EBookOperationFlags
- * @cancellable: (allow-none): a #GCancellable; can be %NULL
+ * @opflags: (type EBookOperationFlags): bit-or of #EBookOperationFlags
+ * @cancellable: a #GCancellable; can be %NULL
* @callback: callback to call when a result is ready
* @user_data: user data for the @callback
*
@@ -2360,9 +2358,9 @@ e_book_client_add_contacts (EBookClient *client,
* e_book_client_add_contacts_finish:
* @client: an #EBookClient
* @result: a #GAsyncResult
- * @out_added_uids: (out) (element-type utf8) (allow-none): UIDs of
+ * @out_added_uids: (out) (element-type utf8) (optional): UIDs of
* newly added contacts; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_book_client_add_contacts() and
* sets @out_added_uids to the UIDs of newly added contacts if successful.
@@ -2409,11 +2407,11 @@ e_book_client_add_contacts_finish (EBookClient *client,
* e_book_client_add_contacts_sync:
* @client: an #EBookClient
* @contacts: (element-type EContact): a #GSList of #EContact objects to add
- * @opflags: bit-or of #EBookOperationFlags
- * @out_added_uids: (out) (element-type utf8) (allow-none): UIDs of newly
+ * @opflags: (type EBookOperationFlags): bit-or of #EBookOperationFlags
+ * @out_added_uids: (out) (element-type utf8) (optional): UIDs of newly
* added contacts; can be %NULL
* @cancellable: a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Adds @contacts to @client and
* sets @out_added_uids to the UIDs of newly added contacts if successful.
@@ -2529,7 +2527,7 @@ book_client_modify_contact_thread (GSimpleAsyncResult *simple,
* e_book_client_modify_contact:
* @client: an #EBookClient
* @contact: an #EContact
- * @opflags: bit-or of #EBookOperationFlags
+ * @opflags: (type EBookOperationFlags): bit-or of #EBookOperationFlags
* @cancellable: a #GCancellable; can be %NULL
* @callback: callback to call when a result is ready
* @user_data: user data for the @callback
@@ -2578,7 +2576,7 @@ e_book_client_modify_contact (EBookClient *client,
* e_book_client_modify_contact_finish:
* @client: an #EBookClient
* @result: a #GAsyncResult
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_book_client_modify_contact().
*
@@ -2608,9 +2606,9 @@ e_book_client_modify_contact_finish (EBookClient *client,
* e_book_client_modify_contact_sync:
* @client: an #EBookClient
* @contact: an #EContact
- * @opflags: bit-or of #EBookOperationFlags
+ * @opflags: (type EBookOperationFlags): bit-or of #EBookOperationFlags
* @cancellable: a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Applies the changes made to @contact to the stored version in @client.
*
@@ -2666,8 +2664,8 @@ book_client_modify_contacts_thread (GSimpleAsyncResult *simple,
* e_book_client_modify_contacts:
* @client: an #EBookClient
* @contacts: (element-type EContact): a #GSList of #EContact objects
- * @opflags: bit-or of #EBookOperationFlags
- * @cancellable: (allow-none): a #GCancellable; can be %NULL
+ * @opflags: (type EBookOperationFlags): bit-or of #EBookOperationFlags
+ * @cancellable: a #GCancellable; can be %NULL
* @callback: callback to call when a result is ready
* @user_data: user data for the @callback
*
@@ -2716,7 +2714,7 @@ e_book_client_modify_contacts (EBookClient *client,
* e_book_client_modify_contacts_finish:
* @client: an #EBookClient
* @result: a #GAsyncResult
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_book_client_modify_contacts().
*
@@ -2746,9 +2744,9 @@ e_book_client_modify_contacts_finish (EBookClient *client,
* e_book_client_modify_contacts_sync:
* @client: an #EBookClient
* @contacts: (element-type EContact): a #GSList of #EContact objects
- * @opflags: bit-or of #EBookOperationFlags
- * @cancellable: (allow-none): a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @opflags: (type EBookOperationFlags): bit-or of #EBookOperationFlags
+ * @cancellable: a #GCancellable; can be %NULL
+ * @error: a #GError to set an error, if any
*
* Applies the changes made to @contacts to the stored versions in @client.
*
@@ -2831,7 +2829,7 @@ book_client_remove_contact_thread (GSimpleAsyncResult *simple,
* e_book_client_remove_contact:
* @client: an #EBookClient
* @contact: an #EContact
- * @opflags: bit-or of #EBookOperationFlags
+ * @opflags: (type EBookOperationFlags): bit-or of #EBookOperationFlags
* @cancellable: a #GCancellable; can be %NULL
* @callback: callback to call when a result is ready
* @user_data: user data for the @callback
@@ -2880,7 +2878,7 @@ e_book_client_remove_contact (EBookClient *client,
* e_book_client_remove_contact_finish:
* @client: an #EBookClient
* @result: a #GAsyncResult
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_book_client_remove_contact().
*
@@ -2910,9 +2908,9 @@ e_book_client_remove_contact_finish (EBookClient *client,
* e_book_client_remove_contact_sync:
* @client: an #EBookClient
* @contact: an #EContact
- * @opflags: bit-or of #EBookOperationFlags
+ * @opflags: (type EBookOperationFlags): bit-or of #EBookOperationFlags
* @cancellable: a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Removes @contact from the @client.
*
@@ -2971,7 +2969,7 @@ book_client_remove_contact_by_uid_thread (GSimpleAsyncResult *simple,
* e_book_client_remove_contact_by_uid:
* @client: an #EBookClient
* @uid: a UID of a contact to remove
- * @opflags: bit-or of #EBookOperationFlags
+ * @opflags: (type EBookOperationFlags): bit-or of #EBookOperationFlags
* @cancellable: a #GCancellable; can be %NULL
* @callback: callback to call when a result is ready
* @user_data: user data for the @callback
@@ -3020,7 +3018,7 @@ e_book_client_remove_contact_by_uid (EBookClient *client,
* e_book_client_remove_contact_by_uid_finish:
* @client: an #EBookClient
* @result: a #GAsyncResult
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_book_client_remove_contact_by_uid().
*
@@ -3050,9 +3048,9 @@ e_book_client_remove_contact_by_uid_finish (EBookClient *client,
* e_book_client_remove_contact_by_uid_sync:
* @client: an #EBookClient
* @uid: a UID of a contact to remove
- * @opflags: bit-or of #EBookOperationFlags
+ * @opflags: (type EBookOperationFlags): bit-or of #EBookOperationFlags
* @cancellable: a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Removes contact with @uid from the @client.
*
@@ -3108,7 +3106,7 @@ book_client_remove_contacts_thread (GSimpleAsyncResult *simple,
* e_book_client_remove_contacts:
* @client: an #EBookClient
* @uids: (element-type utf8): a #GSList of UIDs to remove
- * @opflags: bit-or of #EBookOperationFlags
+ * @opflags: (type EBookOperationFlags): bit-or of #EBookOperationFlags
* @cancellable: a #GCancellable; can be %NULL
* @callback: callback to call when a result is ready
* @user_data: user data for the @callback
@@ -3161,7 +3159,7 @@ e_book_client_remove_contacts (EBookClient *client,
* e_book_client_remove_contacts_finish:
* @client: an #EBookClient
* @result: a #GAsyncResult
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_book_client_remove_contacts().
*
@@ -3191,9 +3189,9 @@ e_book_client_remove_contacts_finish (EBookClient *client,
* e_book_client_remove_contacts_sync:
* @client: an #EBookClient
* @uids: (element-type utf8): a #GSList of UIDs to remove
- * @opflags: bit-or of #EBookOperationFlags
+ * @opflags: (type EBookOperationFlags): bit-or of #EBookOperationFlags
* @cancellable: a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Removes the contacts with uids from the list @uids from @client. This is
* always more efficient than calling e_book_client_remove_contact() if you
@@ -3317,8 +3315,8 @@ e_book_client_get_contact (EBookClient *client,
* e_book_client_get_contact_finish:
* @client: an #EBookClient
* @result: a #GAsyncResult
- * @out_contact: (out): an #EContact for previously given uid
- * @error: (out): a #GError to set an error, if any
+ * @out_contact: (out) (optional): an #EContact for previously given uid
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_book_client_get_contact().
* If successful, then the @out_contact is set to newly allocated
@@ -3362,7 +3360,7 @@ e_book_client_get_contact_finish (EBookClient *client,
* @uid: a unique string ID specifying the contact
* @out_contact: (out): an #EContact for given @uid
* @cancellable: a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Receive #EContact from the @client for the gived @uid.
* If successful, then the @out_contact is set to newly allocated
@@ -3517,7 +3515,7 @@ e_book_client_get_contacts (EBookClient *client,
* @result: a #GAsyncResult
* @out_contacts: (element-type EContact) (out) (transfer full): a #GSList
* of matched #EContact(s)
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_book_client_get_contacts().
* If successful, then the @out_contacts is set to newly allocated list of
@@ -3562,7 +3560,7 @@ e_book_client_get_contacts_finish (EBookClient *client,
* @out_contacts: (element-type EContact) (out): a #GSList of matched
* #EContact(s)
* @cancellable: a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Query @client with @sexp, receiving a list of contacts which matched.
* If successful, then the @out_contacts is set to newly allocated #GSList of
@@ -3735,7 +3733,7 @@ e_book_client_get_contacts_uids (EBookClient *client,
* @result: a #GAsyncResult
* @out_contact_uids: (element-type utf8) (out): a #GSList of matched
* contact UIDs stored as strings
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_book_client_get_contacts_uids().
* If successful, then the @out_contact_uids is set to newly allocated list
@@ -3780,7 +3778,7 @@ e_book_client_get_contacts_uids_finish (EBookClient *client,
* @out_contact_uids: (element-type utf8) (out): a #GSList of matched
* contacts UIDs stored as strings
* @cancellable: a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Query @client with @sexp, receiving a list of contacts UIDs which matched.
* If successful, then the @out_contact_uids is set to newly allocated list
@@ -3986,7 +3984,7 @@ e_book_client_get_view (EBookClient *client,
* @client: an #EBookClient
* @result: a #GAsyncResult
* @out_view: (out): an #EBookClientView
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_book_client_get_view().
* If successful, then the @out_view is set to newly allocated
@@ -4030,7 +4028,7 @@ e_book_client_get_view_finish (EBookClient *client,
* @sexp: an S-expression representing the query
* @out_view: (out): an #EBookClientView
* @cancellable: a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Query @client with @sexp, creating an #EBookClientView.
* If successful, then the @out_view is set to newly allocated
@@ -4355,7 +4353,7 @@ e_book_client_get_cursor (EBookClient *client,
* @client: an #EBookClient
* @result: a #GAsyncResult
* @out_cursor: (out): return location for an #EBookClientCursor
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_book_client_get_cursor().
* If successful, then the @out_cursor is set to newly create
@@ -4404,7 +4402,7 @@ e_book_client_get_cursor_finish (EBookClient *client,
* @n_fields: the length of the input @sort_fields and @sort_types arrays
* @out_cursor: (out): return location for an #EBookClientCursor
* @cancellable: a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Create an #EBookClientCursor. If successful, then the @out_cursor is set
* to newly allocated #EBookClientCursor, the cursor should be freed with g_object_unref()
diff --git a/src/addressbook/libebook/e-book-utils.c b/src/addressbook/libebook/e-book-utils.c
index ece8dfa7d..08d4b8ed0 100644
--- a/src/addressbook/libebook/e-book-utils.c
+++ b/src/addressbook/libebook/e-book-utils.c
@@ -189,7 +189,7 @@ book_utils_get_recipient_certificates_thread (gpointer data,
* @registry: an #ESourceRegistry
* @only_clients: (element-type EBookClient) (nullable): optional #GSList of
* the #EBookClient objects to search for the certificates in, or %NULL
- * @flags: bit-or of #CamelRecipientCertificateFlags
+ * @flags: (type Camel.RecipientCertificateFlags): bit-or of #CamelRecipientCertificateFlags
* @recipients: (element-type utf8): a #GPtrArray of recipients' email addresses
* @out_certificates: (element-type utf8) (out): a #GSList of gathered certificates
* encoded in base64
diff --git a/src/addressbook/libebook/e-book.c b/src/addressbook/libebook/e-book.c
index c7dc8aedd..06c5953f6 100644
--- a/src/addressbook/libebook/e-book.c
+++ b/src/addressbook/libebook/e-book.c
@@ -1565,8 +1565,8 @@ e_book_remove_contacts_async (EBook *book,
* e_book_get_book_view:
* @book: an #EBook
* @query: an #EBookQuery
- * @requested_fields: (allow-none) (element-type utf8): a #GList containing
- * the names of fields to return, or NULL for all
+ * @requested_fields: (nullable) (element-type utf8): a #GList containing
+ * the names of fields to return, or %NULL for all
* @max_results: the maximum number of contacts to show (or 0 for all)
* @book_view: (out): An #EBookView pointer, will be set to the view
* @error: a #GError to set on failure
@@ -1706,9 +1706,8 @@ e_book_async_get_book_view (EBook *book,
* e_book_get_book_view_async:
* @book: an #EBook
* @query: an #EBookQuery
- * @requested_fields: (allow-none) (element-type utf8): a #GList containing
- * the names of fields to
- * return, or NULL for all
+ * @requested_fields: (nullable) (element-type utf8): a #GList containing
+ * the names of fields to return, or %NULL for all
* @max_results: the maximum number of contacts to show (or 0 for all)
* @cb: (scope async): a function to call when the operation finishes
* @closure: data to pass to callback function
diff --git a/src/addressbook/libebook/e-destination.c b/src/addressbook/libebook/e-destination.c
index 81c1a5d86..a880fbef7 100644
--- a/src/addressbook/libebook/e-destination.c
+++ b/src/addressbook/libebook/e-destination.c
@@ -1195,7 +1195,8 @@ e_destination_list_show_addresses (const EDestination *dest)
* to @dest.
* The list and its elements belong to @dest, and should not be freed.
*
- * Returns: (element-type EDestination) (transfer none): A list of elements of type #EDestination, or %NULL.
+ * Returns: (element-type EDestination) (transfer none) (nullable): A list of elements of type
+ * #EDestination, or %NULL.
*
* Since: 3.2
**/
@@ -1218,7 +1219,8 @@ e_destination_list_get_root_dests (const EDestination *dest)
* Everything returned from this function belongs to @dest and
* thus should not be freed.
*
- * Returns: (element-type EDestination) (transfer none): A list of elements of type #EDestination, or %NULL.
+ * Returns: (element-type EDestination) (transfer none) (nullable): A list of elements of type
+ * #EDestination, or %NULL.
*
* Since: 3.2
**/
diff --git a/src/addressbook/libedata-book/e-book-backend-sqlitedb.c
b/src/addressbook/libedata-book/e-book-backend-sqlitedb.c
index 1826a762d..b87a2b199 100644
--- a/src/addressbook/libedata-book/e-book-backend-sqlitedb.c
+++ b/src/addressbook/libedata-book/e-book-backend-sqlitedb.c
@@ -1785,7 +1785,7 @@ summary_fields_add_indexes (GArray *array,
* @folder_name: name of the address-book
* @store_vcard: True if the vcard should be stored inside db, if FALSE only the summary fields would be
stored inside db.
* @setup: an #ESourceBackendSummarySetup describing how the summary should be setup
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* Like e_book_backend_sqlitedb_new(), but allows configuration of which contact fields
* will be stored for quick reference in the summary. The configuration indicated by
@@ -1886,7 +1886,7 @@ e_book_backend_sqlitedb_new_full (const gchar *path,
* @folderid: folder id of the address-book
* @folder_name: name of the address-book
* @store_vcard: True if the vcard should be stored inside db, if FALSE only the summary fields would be
stored inside db.
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* If the path for multiple addressbooks are same, the contacts from all addressbooks
* would be stored in same db in different tables.
@@ -2379,7 +2379,7 @@ insert_contact (EBookBackendSqliteDB *ebsdb,
* @folderid: folder id
* @contact: EContact to be added
* @replace_existing: Whether this contact should replace another contact with the same UID.
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* This is a convenience wrapper for e_book_backend_sqlitedb_new_contacts,
* which is the preferred means to add or modify multiple contacts when possible.
@@ -2417,7 +2417,7 @@ e_book_backend_sqlitedb_new_contact (EBookBackendSqliteDB *ebsdb,
* @folderid: folder id
* @contacts: (element-type EContact): list of #EContact
* @replace_existing: Whether this contact should replace another contact with the same UID.
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* Adds or replaces contacts in @ebsdb. If @replace_existing is specified then existing
* contacts with the same UID will be replaced, otherwise adding an existing contact
@@ -2486,7 +2486,7 @@ e_book_backend_sqlitedb_new_contacts (EBookBackendSqliteDB *ebsdb,
* @contact: EContact to be added
* @partial_content: contact does not contain full information. Used when
* the backend cache's partial information for auto-completion.
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* This is a convenience wrapper for e_book_backend_sqlitedb_add_contacts,
* which is the preferred means to add multiple contacts when possible.
@@ -2514,7 +2514,7 @@ e_book_backend_sqlitedb_add_contact (EBookBackendSqliteDB *ebsdb,
* @contacts: (element-type EContact): list of #EContact
* @partial_content: contact does not contain full information. Used when
* the backend cache's partial information for auto-completion.
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* Returns: %TRUE on success, otherwise %FALSE is returned and @error is set appropriately.
*
@@ -2537,7 +2537,7 @@ e_book_backend_sqlitedb_add_contacts (EBookBackendSqliteDB *ebsdb,
* @ebsdb: An #EBookBackendSqliteDB
* @folderid: folder id
* @uid: the uid of the contact to remove
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* Removes the contact indicated by @uid from the folder @folderid in @ebsdb.
*
@@ -2615,7 +2615,7 @@ generate_delete_stmt (const gchar *table,
* @ebsdb: An #EBookBackendSqliteDB
* @folderid: folder id
* @uids: (element-type utf8): a #GSList of uids indicating which contacts to remove
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* Removes the contacts indicated by @uids from the folder @folderid in @ebsdb.
*
@@ -2692,7 +2692,7 @@ contact_found_cb (gpointer ref,
* @folderid: folder id
* @uid: The uid of the contact to check for
* @partial_content: This parameter is deprecated and unused.
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* Checks if a contact bearing the UID indicated by @uid is stored
* in @folderid of @ebsdb.
@@ -2760,10 +2760,10 @@ get_vcard_cb (gpointer ref,
* @ebsdb: An #EBookBackendSqliteDB
* @folderid: folder id
* @uid: The uid of the contact to fetch
- * @fields_of_interest: (allow-none) (element-type utf8 gint): A #GHashTable indicating which fields
+ * @fields_of_interest: (nullable) (element-type utf8 gint): A #GHashTable indicating which fields
* should be included in returned contacts
- * @with_all_required_fields: (out) (allow-none): Whether all of the fields of interest were available
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @with_all_required_fields: (out) (optional): Whether all of the fields of interest were available
+ * @error: A location to store any error that may have occurred.
*
* Fetch the #EContact specified by @uid in @folderid of @ebsdb.
*
@@ -2988,8 +2988,8 @@ store_data_to_vcard (gpointer ref,
* @uid: The uid to fetch a vcard for
* @fields_of_interest: (element-type utf8 gint) (nullable): The required fields for this vcard,
* or %NULL to require all fields.
- * @with_all_required_fields: (allow-none) (out): Whether all the required fields are present in the
returned vcard.
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @with_all_required_fields: (nullable) (out): Whether all the required fields are present in the returned
vcard.
+ * @error: A location to store any error that may have occurred.
*
* Searches @ebsdb in the context of @folderid for @uid.
*
@@ -4225,14 +4225,14 @@ book_backend_sqlitedb_search_full (EBookBackendSqliteDB *ebsdb,
* e_book_backend_sqlitedb_search:
* @ebsdb: An #EBookBackendSqliteDB
* @folderid: folder id of the address-book
- * @sexp: (allow-none): search expression; use %NULL or an empty string to get all stored contacts.
+ * @sexp: (nullable): search expression; use %NULL or an empty string to get all stored contacts.
* @fields_of_interest: (nullable) (element-type utf8 gint): A #GHashTable indicating which fields
* should be included in the returned contacts
- * @searched: (allow-none) (out): Whether @ebsdb was capable of searching
+ * @searched: (optional) (out): Whether @ebsdb was capable of searching
* for the provided query @sexp.
- * @with_all_required_fields: (allow-none) (out): Whether all the required
+ * @with_all_required_fields: (nullable) (out): Whether all the required
* fields are present in the returned vcards.
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* Searching with summary fields is always supported. Search expressions
* containing any other field is supported only if backend chooses to store
@@ -4339,9 +4339,9 @@ e_book_backend_sqlitedb_search (EBookBackendSqliteDB *ebsdb,
* e_book_backend_sqlitedb_search_uids:
* @ebsdb: An #EBookBackendSqliteDB
* @folderid: folder id of the address-book
- * @sexp: (allow-none): search expression; use %NULL or an empty string to get all stored contacts.
- * @searched: (allow-none) (out): Whether @ebsdb was capable of searching for the provided query @sexp.
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @sexp: (nullable): search expression; use %NULL or an empty string to get all stored contacts.
+ * @searched: (optional) (out): Whether @ebsdb was capable of searching for the provided query @sexp.
+ * @error: A location to store any error that may have occurred.
*
* Similar to e_book_backend_sqlitedb_search(), but returns only a list of contact UIDs.
*
@@ -4463,7 +4463,7 @@ get_uids_and_rev_cb (gpointer user_data,
* e_book_backend_sqlitedb_get_uids_and_rev:
* @ebsdb: An #EBookBackendSqliteDB
* @folderid: folder id of the address-book
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* Gets hash table of all uids (key) and rev (value) pairs stored
* for each contact in the cache. The hash table should be freed
@@ -4506,7 +4506,7 @@ e_book_backend_sqlitedb_get_uids_and_rev (EBookBackendSqliteDB *ebsdb,
* e_book_backend_sqlitedb_get_is_populated:
* @ebsdb: An #EBookBackendSqliteDB
* @folderid: folder id of the address-book
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* Checks whether the 'is populated' flag is set for @folderid in @ebsdb.
*
@@ -4551,7 +4551,7 @@ e_book_backend_sqlitedb_get_is_populated (EBookBackendSqliteDB *ebsdb,
* @ebsdb: An #EBookBackendSqliteDB
* @folderid: folder id of the address-book
* @populated: The new value for the 'is populated' flag.
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* Sets the value of the 'is populated' flag for @folderid in @ebsdb.
*
@@ -4604,7 +4604,7 @@ e_book_backend_sqlitedb_set_is_populated (EBookBackendSqliteDB *ebsdb,
* @folderid: folder id of the address-book
* @revision_out: (out) (transfer full): The location to return the current
* revision
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* Fetches the current revision for the address-book indicated by @folderid.
*
@@ -4645,7 +4645,7 @@ e_book_backend_sqlitedb_get_revision (EBookBackendSqliteDB *ebsdb,
* @ebsdb: An #EBookBackendSqliteDB
* @folderid: folder id of the address-book
* @revision: The new revision
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* Sets the current revision for the address-book indicated by @folderid to be @revision.
*
@@ -4696,7 +4696,7 @@ e_book_backend_sqlitedb_set_revision (EBookBackendSqliteDB *ebsdb,
* e_book_backend_sqlitedb_get_has_partial_content
* @ebsdb: An #EBookBackendSqliteDB
* @folderid: folder id of the address-book
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* Fetches the 'partial content' flag from @folderid in @ebsdb.
*
@@ -4743,7 +4743,7 @@ e_book_backend_sqlitedb_get_has_partial_content (EBookBackendSqliteDB *ebsdb,
* @ebsdb: An #EBookBackendSqliteDB
* @folderid: folder id of the address-book
* @partial_content: new value for the 'partial content' flag
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* Sets the value of the 'partial content' flag in @folderid of @ebsdb.
*
@@ -4795,7 +4795,7 @@ e_book_backend_sqlitedb_set_has_partial_content (EBookBackendSqliteDB *ebsdb,
* @ebsdb: An #EBookBackendSqliteDB
* @folderid: folder id of the address-book
* @uid: The UID of the contact to fetch extra data for.
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* Fetches extra auxiliary data previously set for @uid.
*
@@ -4846,7 +4846,7 @@ e_book_backend_sqlitedb_get_contact_bdata (EBookBackendSqliteDB *ebsdb,
* @folderid: folder id of the address-book
* @uid: The UID of the contact to fetch extra data for.
* @value: The auxiliary data to set for @uid in @folderid.
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* Sets the extra auxiliary data for the contact indicated by @uid.
*
@@ -4900,7 +4900,7 @@ e_book_backend_sqlitedb_set_contact_bdata (EBookBackendSqliteDB *ebsdb,
* e_book_backend_sqlitedb_get_sync_data:
* @ebsdb: An #EBookBackendSqliteDB
* @folderid: folder id of the address-book
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* Fetches data previously set with e_book_backend_sqlitedb_set_sync_data() for the given @folderid.
*
@@ -4939,7 +4939,7 @@ e_book_backend_sqlitedb_get_sync_data (EBookBackendSqliteDB *ebsdb,
* @ebsdb: An #EBookBackendSqliteDB
* @folderid: folder id of the address-book
* @sync_data: The data to set.
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* Sets some auxiliary data for the given @folderid in @ebsdb.
*
@@ -4992,7 +4992,7 @@ e_book_backend_sqlitedb_set_sync_data (EBookBackendSqliteDB *ebsdb,
* @ebsdb: An #EBookBackendSqliteDB
* @folderid: folder id of the address-book
* @key: the key to fetch a value for
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* Fetches data previously set with e_book_backend_sqlitedb_set_key_value() for the
* given @key in @folderid.
@@ -5035,7 +5035,7 @@ e_book_backend_sqlitedb_get_key_value (EBookBackendSqliteDB *ebsdb,
* @folderid: folder id of the address-book
* @key: the key to fetch a value for
* @value: the value to story for @key in @folderid
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* Sets the auxiliary data @value to be stored in relation to @key in @folderid.
*
@@ -5089,7 +5089,7 @@ e_book_backend_sqlitedb_set_key_value (EBookBackendSqliteDB *ebsdb,
* e_book_backend_sqlitedb_get_partially_cached_ids:
* @ebsdb: An #EBookBackendSqliteDB
* @folderid: folder id of the address-book
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* Obsolete, do not use, this always ends with an error.
*
@@ -5128,7 +5128,7 @@ e_book_backend_sqlitedb_get_partially_cached_ids (EBookBackendSqliteDB *ebsdb,
* e_book_backend_sqlitedb_delete_addressbook:
* @ebsdb: An #EBookBackendSqliteDB
* @folderid: folder id of the address-book
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* Deletes the addressbook indicated by @folderid in @ebsdb.
*
@@ -5223,7 +5223,7 @@ e_book_backend_sqlitedb_search_data_free (EbSdbSearchData *s_data)
/**
* e_book_backend_sqlitedb_remove:
* @ebsdb: An #EBookBackendSqliteDB
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* Removes the entire @ebsdb from storage on disk.
*
@@ -5355,7 +5355,7 @@ sqlitedb_set_locale_internal (EBookBackendSqliteDB *ebsdb,
* @ebsdb: An #EBookBackendSqliteDB
* @folderid: folder id of the address-book
* @lc_collate: The new locale for the addressbook
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* Relocalizes any locale specific data in the specified
* new @lc_collate locale.
@@ -5444,7 +5444,7 @@ e_book_backend_sqlitedb_set_locale (EBookBackendSqliteDB *ebsdb,
* @ebsdb: An #EBookBackendSqliteDB
* @folderid: folder id of the address-book
* @locale_out: (out) (transfer full): The location to return the current locale
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* Fetches the current locale setting for the address-book indicated by @folderid.
*
@@ -6008,7 +6008,7 @@ cursor_count_position_locked (EBookBackendSqliteDB *ebsdb,
* @sort_fields: (array length=n_sort_fields): An array of #EContactFields as sort keys in order of priority
* @sort_types: (array length=n_sort_fields): An array of #EBookCursorSortTypes, one for each field in
@sort_fields
* @n_sort_fields: The number of fields to sort results by.
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* Creates a new #EbSdbCursor.
*
@@ -6145,9 +6145,9 @@ collect_results_for_cursor_cb (gpointer ref,
* @flags: The #EbSdbCursorStepFlags for this step
* @origin: The #EbSdbCursorOrigin from whence to step
* @count: A positive or negative amount of contacts to try and fetch
- * @results: (out) (allow-none) (element-type EbSdbSearchData) (transfer full):
+ * @results: (out) (optional) (nullable) (element-type EbSdbSearchData) (transfer full):
* A return location to store the results, or %NULL if %EBSDB_CURSOR_STEP_FETCH is not specified in @flags.
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* Steps @cursor through it's sorted query by a maximum of @count contacts
* starting from @origin.
@@ -6411,7 +6411,7 @@ e_book_backend_sqlitedb_cursor_set_target_alphabetic_index (EBookBackendSqliteDB
* @ebsdb: An #EBookBackendSqliteDB
* @cursor: The #EbSdbCursor
* @sexp: The new query expression for @cursor
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* Modifies the current query expression for @cursor. This will not
* modify @cursor's state, but will change the outcome of any further
@@ -6456,9 +6456,9 @@ e_book_backend_sqlitedb_cursor_set_sexp (EBookBackendSqliteDB *ebsdb,
* e_book_backend_sqlitedb_cursor_calculate: (skip)
* @ebsdb: An #EBookBackendSqliteDB
* @cursor: The #EbSdbCursor
- * @total: (out) (allow-none): A return location to store the total result set for this cursor
- * @position: (out) (allow-none): A return location to store the total results before the cursor value
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @total: (out) (optional): A return location to store the total result set for this cursor
+ * @position: (out) (optional): A return location to store the total results before the cursor value
+ * @error: A location to store any error that may have occurred.
*
* Calculates the @total amount of results for the @cursor's query expression,
* as well as the current @position of @cursor in the results. @position is
@@ -6542,7 +6542,7 @@ e_book_backend_sqlitedb_cursor_calculate (EBookBackendSqliteDB *ebsdb,
* @ebsdb: An #EBookBackendSqliteDB
* @cursor: The #EbSdbCursor
* @contact: The #EContact to compare
- * @matches_sexp: (out) (allow-none): Whether the contact matches the cursor's search expression
+ * @matches_sexp: (out) (optional): Whether the contact matches the cursor's search expression
*
* Compares @contact with @cursor and returns whether @contact is less than, equal to, or greater
* than @cursor.
diff --git a/src/addressbook/libedata-book/e-book-sqlite.c b/src/addressbook/libedata-book/e-book-sqlite.c
index e32099405..4b4b7036a 100644
--- a/src/addressbook/libedata-book/e-book-sqlite.c
+++ b/src/addressbook/libedata-book/e-book-sqlite.c
@@ -6578,9 +6578,9 @@ ebsql_new_default (const gchar *path,
/**
* e_book_sqlite_new:
* @path: location to load or create the new database
- * @source: an optional #ESource, associated with the #EBookSqlite, or %NULL
- * @cancellable: (allow-none): A #GCancellable
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @source: (nullable): an optional #ESource, associated with the #EBookSqlite, or %NULL
+ * @cancellable: A #GCancellable
+ * @error: A location to store any error that may have occurred.
*
* Creates a new #EBookSqlite with the default summary configuration.
*
@@ -6618,13 +6618,13 @@ e_book_sqlite_new (const gchar *path,
* e_book_sqlite_new_full:
* @path: location to load or create the new database
* @source: an optional #ESource, associated with the #EBookSqlite, or %NULL
- * @setup: (allow-none): an #ESourceBackendSummarySetup describing how the summary should be setup, or %NULL
to use the default
- * @vcard_callback: (allow-none) (scope async) (closure user_data): A function to resolve vcards
- * @change_callback: (allow-none) (scope async) (closure user_data): A function to catch notifications of
vcard changes
- * @user_data: (allow-none): callback user data
- * @user_data_destroy: (allow-none): A function to free @user_data automatically when the created
#EBookSqlite is destroyed.
- * @cancellable: (allow-none): A #GCancellable
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @setup: (nullable): an #ESourceBackendSummarySetup describing how the summary should be setup, or %NULL
to use the default
+ * @vcard_callback: (nullable) (scope async) (closure user_data): A function to resolve vcards
+ * @change_callback: (nullable) (scope async) (closure user_data): A function to catch notifications of
vcard changes
+ * @user_data: (nullable): callback user data
+ * @user_data_destroy: (nullable): A function to free @user_data automatically when the created #EBookSqlite
is destroyed.
+ * @cancellable: A #GCancellable
+ * @error: A location to store any error that may have occurred.
*
* Opens or creates a new addressbook at @path.
*
@@ -6769,8 +6769,8 @@ e_book_sqlite_new_full (const gchar *path,
* e_book_sqlite_lock:
* @ebsql: An #EBookSqlite
* @lock_type: The #EbSqlLockType to acquire
- * @cancellable: (allow-none): A #GCancellable
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @cancellable: A #GCancellable
+ * @error: A location to store any error that may have occurred.
*
* Obtains an exclusive lock on @ebsql and starts a transaction.
*
@@ -6838,7 +6838,7 @@ e_book_sqlite_lock (EBookSqlite *ebsql,
* e_book_sqlite_unlock:
* @ebsql: An #EBookSqlite
* @action: Which #EbSqlUnlockAction to take while unlocking
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* Releases an exclusive on @ebsql and finishes a transaction previously
* started with e_book_sqlite_lock_updates().
@@ -6929,8 +6929,8 @@ e_book_sqlite_ref_source (EBookSqlite *ebsql)
* @contact: EContact to be added
* @extra: Extra data to store in association with this contact
* @replace: Whether this contact should replace another contact with the same UID.
- * @cancellable: (allow-none): A #GCancellable
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @cancellable: A #GCancellable
+ * @error: A location to store any error that may have occurred.
*
* This is a convenience wrapper for e_book_sqlite_add_contacts(),
* which is the preferred means to add or modify multiple contacts when possible.
@@ -6966,10 +6966,10 @@ e_book_sqlite_add_contact (EBookSqlite *ebsql,
* e_book_sqlite_add_contacts:
* @ebsql: An #EBookSqlite
* @contacts: (element-type EContact): A list of contacts to add to @ebsql
- * @extra: (allow-none) (element-type utf8): A list of extra data to store in association with this contact
+ * @extra: (nullable) (element-type utf8): A list of extra data to store in association with this contact
* @replace: Whether this contact should replace another contact with the same UID.
- * @cancellable: (allow-none): A #GCancellable
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @cancellable: A #GCancellable
+ * @error: A location to store any error that may have occurred.
*
* Adds or replaces contacts in @ebsql. If @replace_existing is specified then existing
* contacts with the same UID will be replaced, otherwise adding an existing contact
@@ -7048,8 +7048,8 @@ e_book_sqlite_add_contacts (EBookSqlite *ebsql,
* e_book_sqlite_remove_contact:
* @ebsql: An #EBookSqlite
* @uid: the uid of the contact to remove
- * @cancellable: (allow-none): A #GCancellable
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @cancellable: A #GCancellable
+ * @error: A location to store any error that may have occurred.
*
* Removes the contact indicated by @uid from @ebsql.
*
@@ -7103,8 +7103,8 @@ generate_delete_stmt (const gchar *table,
* e_book_sqlite_remove_contacts:
* @ebsql: An #EBookSqlite
* @uids: (element-type utf8): a #GSList of uids indicating which contacts to remove
- * @cancellable: (allow-none): A #GCancellable
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @cancellable: A #GCancellable
+ * @error: A location to store any error that may have occurred.
*
* Removes the contacts indicated by @uids from @ebsql.
*
@@ -7180,7 +7180,7 @@ e_book_sqlite_remove_contacts (EBookSqlite *ebsql,
* @ebsql: An #EBookSqlite
* @uid: The uid of the contact to check for
* @exists: (out): Return location to store whether the contact exists.
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* Checks if a contact bearing the UID indicated by @uid is stored in @ebsql.
*
@@ -7219,8 +7219,8 @@ e_book_sqlite_has_contact (EBookSqlite *ebsql,
* @ebsql: An #EBookSqlite
* @uid: The uid of the contact to fetch
* @meta_contact: Whether an entire contact is desired, or only the metadata
- * @ret_contact: (out) (transfer full): Return location to store the fetched contact
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @ret_contact: (out): Return location to store the fetched contact
+ * @error: A location to store any error that may have occurred.
*
* Fetch the #EContact specified by @uid in @ebsql.
*
@@ -7261,8 +7261,8 @@ e_book_sqlite_get_contact (EBookSqlite *ebsql,
* @ebsql: An #EBookSqlite
* @uid: The uid of the contact to fetch
* @meta_contact: Whether an entire contact is desired, or only the metadata
- * @contact: (out) (transfer full): Return location to store the fetched contact
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @contact: (out): Return location to store the fetched contact
+ * @error: A location to store any error that may have occurred.
*
* Fetch the #EContact specified by @uid in @ebsql without locking internal mutex.
*
@@ -7306,8 +7306,8 @@ ebsql_get_contact_unlocked (EBookSqlite *ebsql,
* @ebsql: An #EBookSqlite
* @uid: The uid of the contact to fetch
* @meta_contact: Whether an entire contact is desired, or only the metadata
- * @ret_vcard: (out) (transfer full): Return location to store the fetched vcard string
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @ret_vcard: (out): Return location to store the fetched vcard string
+ * @error: A location to store any error that may have occurred.
*
* Fetch a vcard string for @uid in @ebsql.
*
@@ -7380,8 +7380,8 @@ e_book_sqlite_get_vcard (EBookSqlite *ebsql,
* @ebsql: An #EBookSqlite
* @uid: The uid of the contact to fetch
* @meta_contact: Whether an entire contact is desired, or only the metadata
- * @ret_vcard: (out) (transfer full): Return location to store the fetched vcard string
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @ret_vcard: (out): Return location to store the fetched vcard string
+ * @error: A location to store any error that may have occurred.
*
* Fetch a vcard string for @uid in @ebsql without locking internal mutex.
*
@@ -7448,8 +7448,8 @@ ebsql_get_vcard_unlocked (EBookSqlite *ebsql,
* e_book_sqlite_set_contact_extra:
* @ebsql: An #EBookSqlite
* @uid: The uid of the contact to set the extra data for
- * @extra: (allow-none): The extra data to set
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @extra: (nullable): The extra data to set
+ * @error: A location to store any error that may have occurred.
*
* Sets or replaces the extra data associated with @uid.
*
@@ -7482,8 +7482,8 @@ e_book_sqlite_set_contact_extra (EBookSqlite *ebsql,
* e_book_sqlite_get_contact_extra:
* @ebsql: An #EBookSqlite
* @uid: The uid of the contact to fetch the extra data for
- * @ret_extra: (out) (transfer full): Return location to store the extra data
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @ret_extra: (out): Return location to store the extra data
+ * @error: A location to store any error that may have occurred.
*
* Fetches the extra data previously set for @uid, either with
* e_book_sqlite_set_contact_extra() or when adding contacts.
@@ -7518,8 +7518,8 @@ e_book_sqlite_get_contact_extra (EBookSqlite *ebsql,
* ebsql_get_contact_extra_unlocked:
* @ebsql: An #EBookSqlite
* @uid: The uid of the contact to fetch the extra data for
- * @ret_extra: (out) (transfer full): Return location to store the extra data
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @ret_extra: (out): Return location to store the extra data
+ * @error: A location to store any error that may have occurred.
*
* Fetches the extra data previously set for @uid, either with
* e_book_sqlite_set_contact_extra() or when adding contacts,
@@ -7552,12 +7552,12 @@ ebsql_get_contact_extra_unlocked (EBookSqlite *ebsql,
/**
* e_book_sqlite_search:
* @ebsql: An #EBookSqlite
- * @sexp: (allow-none): search expression; use %NULL or an empty string to list all stored contacts.
+ * @sexp: (nullable): search expression; use %NULL or an empty string to list all stored contacts.
* @meta_contacts: Whether entire contacts are desired, or only the metadata
* @ret_list: (out) (transfer full) (element-type EbSqlSearchData): Return location
* to store a #GSList of #EbSqlSearchData structures
- * @cancellable: (allow-none): A #GCancellable
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @cancellable: A #GCancellable
+ * @error: A location to store any error that may have occurred.
*
* Searches @ebsql for contacts matching the search expression indicated by @sexp.
*
@@ -7605,10 +7605,10 @@ e_book_sqlite_search (EBookSqlite *ebsql,
/**
* e_book_sqlite_search_uids:
* @ebsql: An #EBookSqlite
- * @sexp: (allow-none): search expression; use %NULL or an empty string to get all stored contacts.
+ * @sexp: (nullable): search expression; use %NULL or an empty string to get all stored contacts.
* @ret_list: (out) (transfer full) (element-type utf8): Return location to store a #GSList of contact uids
- * @cancellable: (allow-none): A #GCancellable
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @cancellable: A #GCancellable
+ * @error: A location to store any error that may have occurred.
*
* Similar to e_book_sqlitedb_search(), but fetches only a list of contact UIDs.
*
@@ -7642,8 +7642,8 @@ e_book_sqlite_search_uids (EBookSqlite *ebsql,
* e_book_sqlite_get_key_value:
* @ebsql: An #EBookSqlite
* @key: The key to fetch a value for
- * @value: (out) (transfer full): A return location to store the value for @key
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @value: (out): A return location to store the value for @key
+ * @error: A location to store any error that may have occurred.
*
* Fetches the value for @key and stores it in @value
*
@@ -7679,7 +7679,7 @@ e_book_sqlite_get_key_value (EBookSqlite *ebsql,
* @ebsql: An #EBookSqlite
* @key: The key to fetch a value for
* @value: The new value for @key
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* Sets the value for @key to be @value
*
@@ -7714,7 +7714,7 @@ e_book_sqlite_set_key_value (EBookSqlite *ebsql,
* @ebsql: An #EBookSqlite
* @key: The key to fetch a value for
* @value: (out): A return location to store the value for @key
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* A convenience function to fetch the value of @key as an integer.
*
@@ -7755,7 +7755,7 @@ e_book_sqlite_get_key_value_int (EBookSqlite *ebsql,
* @ebsql: An #EBookSqlite
* @key: The key to fetch a value for
* @value: The new value for @key
- * @error: (allow-none): A location to store any error that may have occurred.
+ * @error: A location to store any error that may have occurred.
*
* A convenience function to set the value of @key as an integer.
*
@@ -7806,7 +7806,7 @@ e_book_sqlite_search_data_free (EbSqlSearchData *data)
* e_book_sqlite_set_locale:
* @ebsql: An #EBookSqlite
* @lc_collate: The new locale for the addressbook
- * @cancellable: (allow-none): A #GCancellable
+ * @cancellable: A #GCancellable
* @error: A location to store any error that may have occurred
*
* Relocalizes any locale specific data in the specified
@@ -8073,9 +8073,9 @@ collect_results_for_cursor_cb (gpointer ref,
* @flags: The #EbSqlCursorStepFlags for this step
* @origin: The #EbSqlCursorOrigin from whence to step
* @count: A positive or negative amount of contacts to try and fetch
- * @results: (out) (allow-none) (element-type EbSqlSearchData) (transfer full):
+ * @results: (out) (nullable) (element-type EbSqlSearchData) (transfer full):
* A return location to store the results, or %NULL if %EBSQL_CURSOR_STEP_FETCH is not specified in @flags.
- * @cancellable: (allow-none): A #GCancellable
+ * @cancellable: A #GCancellable
* @error: A return location to store any error that might be reported.
*
* Steps @cursor through it's sorted query by a maximum of @count contacts
@@ -8399,10 +8399,10 @@ e_book_sqlite_cursor_set_sexp (EBookSqlite *ebsql,
* e_book_sqlite_cursor_calculate: (skip)
* @ebsql: An #EBookSqlite
* @cursor: The #EbSqlCursor
- * @total: (out) (allow-none): A return location to store the total result set for this cursor
- * @position: (out) (allow-none): A return location to store the total results before the cursor value
- * @cancellable: (allow-none): A #GCancellable
- * @error: (allow-none): A return location to store any error that might be reported.
+ * @total: (out) (optional): A return location to store the total result set for this cursor
+ * @position: (out) (optional): A return location to store the total results before the cursor value
+ * @cancellable: A #GCancellable
+ * @error: A return location to store any error that might be reported.
*
* Calculates the @total amount of results for the @cursor's query expression,
* as well as the current @position of @cursor in the results. @position is
@@ -8486,7 +8486,7 @@ e_book_sqlite_cursor_calculate (EBookSqlite *ebsql,
* @ebsql: An #EBookSqlite
* @cursor: The #EbSqlCursor
* @contact: The #EContact to compare
- * @matches_sexp: (out) (allow-none): Whether the contact matches the cursor's search expression
+ * @matches_sexp: (out) (optional): Whether the contact matches the cursor's search expression
*
* Compares @contact with @cursor and returns whether @contact is less than, equal to, or greater
* than @cursor.
diff --git a/src/addressbook/libedata-book/e-data-book-cursor.c
b/src/addressbook/libedata-book/e-data-book-cursor.c
index 18f4c71e8..0d8d29565 100644
--- a/src/addressbook/libedata-book/e-data-book-cursor.c
+++ b/src/addressbook/libedata-book/e-data-book-cursor.c
@@ -734,9 +734,9 @@ e_data_book_cursor_get_position (EDataBookCursor *cursor)
/**
* e_data_book_cursor_set_sexp:
* @cursor: an #EDataBookCursor
- * @sexp: (allow-none): the search expression to set
- * @cancellable: (allow-none): A #GCancellable
- * @error: (out) (allow-none): return location for a #GError, or %NULL
+ * @sexp: (nullable): the search expression to set
+ * @cancellable: A #GCancellable
+ * @error: return location for a #GError, or %NULL
*
* Sets the search expression for the cursor
*
@@ -795,10 +795,10 @@ e_data_book_cursor_set_sexp (EDataBookCursor *cursor,
* @flags: The #EBookCursorStepFlags for this step
* @origin: The #EBookCursorOrigin from whence to step
* @count: a positive or negative amount of contacts to try and fetch
- * @results: (out) (allow-none) (element-type utf8) (transfer full):
+ * @results: (out) (nullable) (element-type utf8) (transfer full):
* A return location to store the results, or %NULL if %E_BOOK_CURSOR_STEP_FETCH is not specified in @flags
- * @cancellable: (allow-none): A #GCancellable
- * @error: (out) (allow-none): return location for a #GError, or %NULL
+ * @cancellable: A #GCancellable
+ * @error: return location for a #GError, or %NULL
*
* Steps @cursor through it's sorted query by a maximum of @count contacts
* starting from @origin.
@@ -875,8 +875,8 @@ e_data_book_cursor_step (EDataBookCursor *cursor,
* @cursor: an #EDataBookCursor
* @index: the alphabetic index
* @locale: the locale in which @index is expected to be a valid alphabetic index
- * @cancellable: (allow-none): A #GCancellable
- * @error: (out) (allow-none): return location for a #GError, or %NULL
+ * @cancellable: A #GCancellable
+ * @error: return location for a #GError, or %NULL
*
* Sets the @cursor position to an
* <link linkend="cursor-alphabet">Alphabetic Index</link>
@@ -943,8 +943,8 @@ e_data_book_cursor_set_alphabetic_index (EDataBookCursor *cursor,
/**
* e_data_book_cursor_recalculate:
* @cursor: an #EDataBookCursor
- * @cancellable: (allow-none): A #GCancellable
- * @error: (out) (allow-none): return location for a #GError, or %NULL
+ * @cancellable: A #GCancellable
+ * @error: return location for a #GError, or %NULL
*
* Recalculates the cursor's total and position, this is meant
* for cursor created in Direct Read Access mode to synchronously
@@ -992,9 +992,9 @@ e_data_book_cursor_recalculate (EDataBookCursor *cursor,
/**
* e_data_book_cursor_load_locale:
* @cursor: an #EDataBookCursor
- * @locale: (out) (allow-none): return location for the locale
- * @cancellable: (allow-none): A #GCancellable
- * @error: (out) (allow-none): return location for a #GError, or %NULL
+ * @locale: (out) (optional): return location for the locale
+ * @cancellable: A #GCancellable
+ * @error: return location for a #GError, or %NULL
*
* Load the current locale setting from the cursor's underlying database.
*
@@ -1165,7 +1165,7 @@ e_data_book_cursor_contact_removed (EDataBookCursor *cursor,
* @cursor: an #EDataBookCursor
* @connection: the #GDBusConnection to register with
* @object_path: the object path to place the direct access configuration data
- * @error: (out) (allow-none): a location to store any error which might occur while registering
+ * @error: a location to store any error which might occur while registering
*
* Places @cursor on the @connection at @object_path
*
diff --git a/src/addressbook/libedata-book/e-data-book-cursor.h
b/src/addressbook/libedata-book/e-data-book-cursor.h
index e33935476..a10b1e68f 100644
--- a/src/addressbook/libedata-book/e-data-book-cursor.h
+++ b/src/addressbook/libedata-book/e-data-book-cursor.h
@@ -50,8 +50,8 @@ typedef struct _EDataBookCursorPrivate EDataBookCursorPrivate;
/**
* EDataBookCursorSetSexpFunc:
* @cursor: an #EDataBookCursor
- * @sexp: (allow-none): the search expression to set, or %NULL for unfiltered results
- * @error: (out) (allow-none): return location for a #GError, or %NULL
+ * @sexp: (nullable): the search expression to set, or %NULL for unfiltered results
+ * @error: return location for a #GError, or %NULL
*
* Method type for #EDataBookCursorClass.set_sexp()
*
@@ -75,14 +75,14 @@ typedef gboolean (*EDataBookCursorSetSexpFunc) (EDataBookCursor *cursor,
/**
* EDataBookCursorStepFunc:
* @cursor: an #EDataBookCursor
- * @revision_guard: (allow-none): The expected current addressbook revision, or %NULL
+ * @revision_guard: (nullable): The expected current addressbook revision, or %NULL
* @flags: The #EBookCursorStepFlags for this step
* @origin: The #EBookCursorOrigin from whence to step
* @count: a positive or negative amount of contacts to try and fetch
- * @results: (out) (allow-none) (element-type utf8) (transfer full):
+ * @results: (out) (nullable) (element-type utf8) (transfer full):
* A return location to store the results, or %NULL if %E_BOOK_CURSOR_STEP_FETCH is not specified in @flags
- * @cancellable: (allow-none): A #GCancellable
- * @error: (out) (allow-none): return location for a #GError, or %NULL
+ * @cancellable: A #GCancellable
+ * @error: return location for a #GError, or %NULL
*
* Method type for #EDataBookCursorClass.step()
*
@@ -122,7 +122,7 @@ typedef gint (*EDataBookCursorStepFunc) (EDataBookCursor *cursor,
* @cursor: an #EDataBookCursor
* @index: the alphabetic index
* @locale: the locale in which @index is expected to be a valid alphabetic index
- * @error: (out) (allow-none): return location for a #GError, or %NULL
+ * @error: return location for a #GError, or %NULL
*
* Method type for #EDataBookCursorClass.set_alphabetic_index()
*
@@ -148,8 +148,8 @@ typedef gboolean (*EDataBookCursorSetAlphabetIndexFunc) (EDataBookCursor *cu
* @cursor: an #EDataBookCursor
* @total: (out): The total number of contacts matching @cursor's query expression
* @position: (out): The current position of @cursor in it's result list
- * @cancellable: (allow-none): A #GCancellable
- * @error: (out) (allow-none): return location for a #GError, or %NULL
+ * @cancellable: A #GCancellable
+ * @error: return location for a #GError, or %NULL
*
* Method type for #EDataBookCursorClass.get_position()
*
@@ -189,7 +189,7 @@ typedef gboolean (*EDataBookCursorGetPositionFunc) (EDataBookCursor *cursor,
* EDataBookCursorCompareContactFunc:
* @cursor: an #EDataBookCursor
* @contact: the #EContact to compare with @cursor
- * @matches_sexp: (out) (allow-none): return location to set whether @contact matched @cursor's search
expression
+ * @matches_sexp: (out) (nullable): return location to set whether @contact matched @cursor's search
expression
*
* Method type for #EDataBookCursorClass.compare_contact()
*
@@ -213,7 +213,7 @@ typedef gint (*EDataBookCursorCompareContactFunc) (EDataBookCursor *cursor,
* EDataBookCursorLoadLocaleFunc:
* @cursor: an #EDataBookCursor
* @locale: (out) (transfer full): return location to store the newly loaded locale
- * @error: (out) (allow-none): return location for a #GError, or %NULL
+ * @error: return location for a #GError, or %NULL
*
* Method type for #EDataBookCursorClass.load_locale()
*
diff --git a/src/addressbook/libedata-book/e-data-book.c b/src/addressbook/libedata-book/e-data-book.c
index 1e413c4aa..95646ae3f 100644
--- a/src/addressbook/libedata-book/e-data-book.c
+++ b/src/addressbook/libedata-book/e-data-book.c
@@ -1237,7 +1237,7 @@ e_data_book_respond_get_contact (EDataBook *book,
* @book: An #EDataBook
* @opid: An operation ID
* @error: Operation error, if any, automatically freed if passed it
- * @contacts: (allow-none) (element-type EContact): A list of #EContact, or %NULL on error
+ * @contacts: (element-type EContact): A list of #EContact, empty on error
*
* Finishes a call to get list of #EContact, which satisfy certain criteria.
*
@@ -1289,7 +1289,7 @@ e_data_book_respond_get_contact_list (EDataBook *book,
* @book: An #EDataBook
* @opid: An operation ID
* @error: Operation error, if any, automatically freed if passed it
- * @uids: (allow-none) (element-type utf8): A list of picked UIDs, or %NULL on error
+ * @uids: (element-type utf8): A list of picked UIDs, empty on error
*
* Finishes a call to get list of UIDs which satisfy certain criteria.
*
@@ -1340,7 +1340,7 @@ e_data_book_respond_get_contact_list_uids (EDataBook *book,
* @book: An #EDataBook
* @opid: An operation ID
* @error: Operation error, if any, automatically freed if passed it
- * @contacts: (allow-none) (element-type EContact): A list of created #EContact(s), or %NULL on error
+ * @contacts: (element-type EContact): A list of created #EContact(s), empty on error
*
* Finishes a call to create a list contacts.
*
@@ -1391,7 +1391,7 @@ e_data_book_respond_create_contacts (EDataBook *book,
* @book: An #EDataBook
* @opid: An operation ID
* @error: Operation error, if any, automatically freed if passed it
- * @contacts: (allow-none) (element-type EContact): A list of modified #EContact(s), or %NULL on error
+ * @contacts: (element-type EContact): A list of modified #EContact(s), empty on error
*
* Finishes a call to modify a list of contacts.
*
@@ -1443,7 +1443,7 @@ e_data_book_respond_modify_contacts (EDataBook *book,
* @book: An #EDataBook
* @opid: An operation ID
* @error: Operation error, if any, automatically freed if passed it
- * @ids: (allow-none) (element-type utf8): A list of removed contact UID-s, or %NULL on error
+ * @ids: (element-type utf8): A list of removed contact UID-s, empty on error
*
* Finishes a call to remove a list of contacts.
*
@@ -1516,7 +1516,7 @@ e_data_book_report_error (EDataBook *book,
* e_data_book_report_backend_property_changed:
* @book: An #EDataBook
* @prop_name: Property name which changed
- * @prop_value: The new property value
+ * @prop_value: (nullable): The new property value
*
* Notifies the clients about a property change.
*
@@ -2050,8 +2050,8 @@ e_data_book_get_object_path (EDataBook *book)
* e_data_book_set_locale:
* @book: an #EDataBook
* @locale: the new locale to set for this book
- * @cancellable: (allow-none): a #GCancellable
- * @error: (allow-none): a location to store any error which might occur
+ * @cancellable: a #GCancellable
+ * @error: a location to store any error which might occur
*
* Set's the locale for this addressbook, this can result in renormalization of
* locale sensitive data.
diff --git a/src/calendar/libecal/e-cal-client.c b/src/calendar/libecal/e-cal-client.c
index 3a955881a..dfd8dbaff 100644
--- a/src/calendar/libecal/e-cal-client.c
+++ b/src/calendar/libecal/e-cal-client.c
@@ -1637,7 +1637,7 @@ e_cal_client_init (ECalClient *client)
* @source: an #ESource
* @source_type: source type of the calendar
* @wait_for_connected_seconds: timeout, in seconds, to wait for the backend to be fully connected
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
* @error: return location for a #GError, or %NULL
*
* Creates a new #ECalClient for @source and @source_type. If an error
@@ -1659,7 +1659,7 @@ e_cal_client_init (ECalClient *client)
* function will have a descriptive prefix that includes the display
* name of @source.
*
- * Returns: (transfer full): a new #ECalClient, or %NULL
+ * Returns: (transfer full) (nullable): a new #ECalClient, or %NULL
*
* Since: 3.8
**/
@@ -1830,10 +1830,10 @@ exit:
* @source: an #ESource
* @source_type: source tpe of the calendar
* @wait_for_connected_seconds: timeout, in seconds, to wait for the backend to be fully connected
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request
+ * @cancellable: optional #GCancellable object, or %NULL
+ * @callback: a #GAsyncReadyCallback to call when the request
* is satisfied
- * @user_data: (closure): data to pass to the callback function
+ * @user_data: data to pass to the callback function
*
* Asynchronously creates a new #ECalClient for @source and @source_type.
*
@@ -1922,7 +1922,7 @@ e_cal_client_connect (ESource *source,
* function will have a descriptive prefix that includes the display
* name of the #ESource passed to e_cal_client_connect().
*
- * Returns: (transfer full): a new #ECalClient, or %NULL
+ * Returns: (transfer full) (nullable): a new #ECalClient, or %NULL
*
* Since: 3.8
**/
@@ -3155,7 +3155,7 @@ append_timezone_string (gpointer key,
* Gets a calendar component as an iCalendar string, with a toplevel
* VCALENDAR component and all VTIMEZONEs needed for the component.
*
- * Returns: the component as a complete iCalendar string, or NULL on
+ * Returns: (nullable): the component as a complete iCalendar string, or NULL on
* failure. The string should be freed with g_free().
*
* Since: 3.2
@@ -3288,7 +3288,7 @@ e_cal_client_get_default_object (ECalClient *client,
* @client: an #ECalClient
* @result: a #GAsyncResult
* @out_icalcomp: (out) (transfer full): Return value for the default calendar object.
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_cal_client_get_default_object() and
* sets @out_icalcomp to an #ICalComponent from the backend that contains
@@ -3334,7 +3334,7 @@ e_cal_client_get_default_object_finish (ECalClient *client,
* @client: an #ECalClient
* @out_icalcomp: (out) (transfer full): Return value for the default calendar object.
* @cancellable: a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Retrives an #ICalComponent from the backend that contains the default
* values for properties needed. This @out_icalcomp should be freed with
@@ -3418,7 +3418,7 @@ cal_client_get_object_thread (GSimpleAsyncResult *simple,
* e_cal_client_get_object:
* @client: an #ECalClient
* @uid: Unique identifier for a calendar component.
- * @rid: Recurrence identifier.
+ * @rid: (nullable): Recurrence identifier.
* @cancellable: a #GCancellable; can be %NULL
* @callback: callback to call when a result is ready
* @user_data: user data for the @callback
@@ -3473,7 +3473,7 @@ e_cal_client_get_object (ECalClient *client,
* @client: an #ECalClient
* @result: a #GAsyncResult
* @out_icalcomp: (out) (transfer full): Return value for the calendar component object.
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_cal_client_get_object() and
* sets @out_icalcomp to queried component. This function always returns
@@ -3522,10 +3522,10 @@ e_cal_client_get_object_finish (ECalClient *client,
* e_cal_client_get_object_sync:
* @client: an #ECalClient
* @uid: Unique identifier for a calendar component.
- * @rid: Recurrence identifier.
+ * @rid: (nullable): Recurrence identifier.
* @out_icalcomp: (out) (transfer full): Return value for the calendar component object.
* @cancellable: a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Queries a calendar for a calendar component object based
* on its unique identifier. This function always returns
@@ -3742,7 +3742,7 @@ e_cal_client_get_objects_for_uid (ECalClient *client,
* @out_ecalcomps: (out) (transfer full) (element-type ECalComponent):
* Return location for the list of objects obtained from the
* backend
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_cal_client_get_objects_for_uid() and
* sets @out_ecalcomps to a list of #ECalComponent<!-- -->s corresponding to
@@ -3788,8 +3788,8 @@ e_cal_client_get_objects_for_uid_finish (ECalClient *client,
* @out_ecalcomps: (out) (transfer full) (element-type ECalComponent):
* Return location for the list of objects obtained from the
* backend
- * @cancellable: (allow-none): a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @cancellable: a #GCancellable; can be %NULL
+ * @error: a #GError to set an error, if any
*
* Queries a calendar for all calendar components with the given unique
* ID. This will return any recurring event and all its detached recurrences.
@@ -3978,7 +3978,7 @@ e_cal_client_get_object_list (ECalClient *client,
* @result: a #GAsyncResult
* @out_icalcomps: (out) (element-type ICalComponent): list of matching
* #ICalComponent<!-- -->s
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_cal_client_get_object_list() and
* sets @out_icalcomps to a matching list of #ICalComponent-s.
@@ -4022,8 +4022,8 @@ e_cal_client_get_object_list_finish (ECalClient *client,
* @sexp: an S-expression representing the query
* @out_icalcomps: (out) (element-type ICalComponent): list of matching
* #ICalComponent<!-- -->s
- * @cancellable: (allow-none): a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @cancellable: a #GCancellable; can be %NULL
+ * @error: a #GError to set an error, if any
*
* Gets a list of objects from the calendar that match the query specified
* by the @sexp argument. The objects will be returned in the @out_icalcomps
@@ -4170,7 +4170,7 @@ e_cal_client_get_object_list_as_comps (ECalClient *client,
* @result: a #GAsyncResult
* @out_ecalcomps: (out) (element-type ECalComponent): list of matching
* #ECalComponent<!-- -->s
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_cal_client_get_object_list_as_comps() and
* sets @out_ecalcomps to a matching list of #ECalComponent-s.
@@ -4214,8 +4214,8 @@ e_cal_client_get_object_list_as_comps_finish (ECalClient *client,
* @sexp: an S-expression representing the query
* @out_ecalcomps: (out) (element-type ECalComponent): list of matching
* #ECalComponent<!-- -->s
- * @cancellable: (allow-none): a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @cancellable: a #GCancellable; can be %NULL
+ * @error: a #GError to set an error, if any
*
* Gets a list of objects from the calendar that match the query specified
* by the @sexp argument. The objects will be returned in the @out_ecalcomps
@@ -4306,7 +4306,7 @@ cal_client_get_free_busy_thread (GSimpleAsyncResult *simple,
* @start: Start time for query
* @end: End time for query
* @users: (element-type utf8): List of users to retrieve free/busy information for
- * @cancellable: (allow-none): a #GCancellable; can be %NULL
+ * @cancellable: a #GCancellable; can be %NULL
* @callback: callback to call when a result is ready
* @user_data: user data for the @callback
*
@@ -4360,8 +4360,8 @@ e_cal_client_get_free_busy (ECalClient *client,
* e_cal_client_get_free_busy_finish:
* @client: an #ECalClient
* @result: a #GAsyncResult
- * @out_freebusy: (element-type ECalComponent): a #GSList of #ECalComponent-s with overall returned
Free/Busy data
- * @error: (out): a #GError to set an error, if any
+ * @out_freebusy: (out) (element-type ECalComponent): a #GSList of #ECalComponent-s with overall returned
Free/Busy data
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_cal_client_get_free_busy().
* The @out_freebusy contains all VFREEBUSY #ECalComponent-s, which could be also
@@ -4409,9 +4409,9 @@ e_cal_client_get_free_busy_finish (ECalClient *client,
* @start: Start time for query
* @end: End time for query
* @users: (element-type utf8): List of users to retrieve free/busy information for
- * @out_freebusy: (element-type ECalComponent): a #GSList of #ECalComponent-s with overall returned
Free/Busy data
- * @cancellable: (allow-none): a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @out_freebusy: (out) (element-type ECalComponent): a #GSList of #ECalComponent-s with overall returned
Free/Busy data
+ * @cancellable: a #GCancellable; can be %NULL
+ * @error: a #GError to set an error, if any
*
* Gets free/busy information from the calendar server.
* The @out_freebusy contains all VFREEBUSY #ECalComponent-s, which could be also
@@ -4512,7 +4512,7 @@ cal_client_create_object_thread (GSimpleAsyncResult *simple,
* e_cal_client_create_object:
* @client: an #ECalClient
* @icalcomp: The component to create
- * @opflags: bit-or of #ECalOperationFlags
+ * @opflags: (type ECalOperationFlags): bit-or of #ECalOperationFlags
* @cancellable: a #GCancellable; can be %NULL
* @callback: callback to call when a result is ready
* @user_data: user data for the @callback
@@ -4561,9 +4561,9 @@ e_cal_client_create_object (ECalClient *client,
* e_cal_client_create_object_finish:
* @client: an #ECalClient
* @result: a #GAsyncResult
- * @out_uid: (out) (nullable): Return value for the UID assigned to the new component
+ * @out_uid: (out) (nullable) (optional): Return value for the UID assigned to the new component
* by the calendar backend
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_cal_client_create_object() and
* sets @out_uid to newly assigned UID for the created object.
@@ -4608,10 +4608,10 @@ e_cal_client_create_object_finish (ECalClient *client,
* @client: an #ECalClient
* @icalcomp: The component to create
* @opflags: bit-or of #ECalOperationFlags
- * @out_uid: (out) (nullable): Return value for the UID assigned to the new component
+ * @out_uid: (out) (nullable) (optional): Return value for the UID assigned to the new component
* by the calendar backend
* @cancellable: a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Requests the calendar backend to create the object specified by the
* @icalcomp argument. Some backends would assign a specific UID to the newly
@@ -4689,8 +4689,8 @@ cal_client_create_objects_thread (GSimpleAsyncResult *simple,
* e_cal_client_create_objects:
* @client: an #ECalClient
* @icalcomps: (element-type ICalComponent): The components to create
- * @opflags: bit-or of #ECalOperationFlags
- * @cancellable: (allow-none): a #GCancellable; can be %NULL
+ * @opflags: (type ECalOperationFlags): bit-or of #ECalOperationFlags
+ * @cancellable: a #GCancellable; can be %NULL
* @callback: callback to call when a result is ready
* @user_data: user data for the @callback
*
@@ -4741,9 +4741,9 @@ e_cal_client_create_objects (ECalClient *client,
* e_cal_client_create_objects_finish:
* @client: an #ECalClient
* @result: a #GAsyncResult
- * @out_uids: (out) (nullable) (element-type utf8): Return value for the UIDs assigned
+ * @out_uids: (out) (optional) (element-type utf8): Return value for the UIDs assigned
* to the new components by the calendar backend
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_cal_client_create_objects() and
* sets @out_uids to newly assigned UIDs for the created objects.
@@ -4785,11 +4785,11 @@ e_cal_client_create_objects_finish (ECalClient *client,
* e_cal_client_create_objects_sync:
* @client: an #ECalClient
* @icalcomps: (element-type ICalComponent): The components to create
- * @opflags: bit-or of #ECalOperationFlags
+ * @opflags: (type ECalOperationFlags): bit-or of #ECalOperationFlags
* @out_uids: (out) (nullable) (element-type utf8): Return value for the UIDs assigned
* to the new components by the calendar backend
- * @cancellable: (allow-none): a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @cancellable: a #GCancellable; can be %NULL
+ * @error: a #GError to set an error, if any
*
* Requests the calendar backend to create the objects specified by the
* @icalcomps argument. Some backends would assign a specific UID to the
@@ -4901,7 +4901,7 @@ cal_client_modify_object_thread (GSimpleAsyncResult *simple,
* @client: an #ECalClient
* @icalcomp: Component to modify
* @mod: Type of modification
- * @opflags: bit-or of #ECalOperationFlags
+ * @opflags: (type ECalOperationFlags): bit-or of #ECalOperationFlags
* @cancellable: a #GCancellable; can be %NULL
* @callback: callback to call when a result is ready
* @user_data: user data for the @callback
@@ -4959,7 +4959,7 @@ e_cal_client_modify_object (ECalClient *client,
* e_cal_client_modify_object_finish:
* @client: an #ECalClient
* @result: a #GAsyncResult
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_cal_client_modify_object().
*
@@ -4990,9 +4990,9 @@ e_cal_client_modify_object_finish (ECalClient *client,
* @client: an #ECalClient
* @icalcomp: Component to modify
* @mod: Type of modification
- * @opflags: bit-or of #ECalOperationFlags
+ * @opflags: (type ECalOperationFlags): bit-or of #ECalOperationFlags
* @cancellable: a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Requests the calendar backend to modify an existing object. If the object
* does not exist on the calendar, an error will be returned.
@@ -5057,8 +5057,8 @@ cal_client_modify_objects_thread (GSimpleAsyncResult *simple,
* @client: an #ECalClient
* @icalcomps: (element-type ICalComponent): Components to modify
* @mod: Type of modification
- * @opflags: bit-or of #ECalOperationFlags
- * @cancellable: (allow-none): a #GCancellable; can be %NULL
+ * @opflags: (type ECalOperationFlags): bit-or of #ECalOperationFlags
+ * @cancellable: a #GCancellable; can be %NULL
* @callback: callback to call when a result is ready
* @user_data: user data for the @callback
*
@@ -5116,7 +5116,7 @@ e_cal_client_modify_objects (ECalClient *client,
* e_cal_client_modify_objects_finish:
* @client: an #ECalClient
* @result: a #GAsyncResult
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_cal_client_modify_objects().
*
@@ -5147,9 +5147,9 @@ e_cal_client_modify_objects_finish (ECalClient *client,
* @client: an #ECalClient
* @icalcomps: (element-type ICalComponent): Components to modify
* @mod: Type of modification
- * @opflags: bit-or of #ECalOperationFlags
- * @cancellable: (allow-none): a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @opflags: (type ECalOperationFlags): bit-or of #ECalOperationFlags
+ * @cancellable: a #GCancellable; can be %NULL
+ * @error: a #GError to set an error, if any
*
* Requests the calendar backend to modify existing objects. If an object
* does not exist on the calendar, an error will be returned.
@@ -5256,9 +5256,9 @@ cal_client_remove_object_thread (GSimpleAsyncResult *simple,
* e_cal_client_remove_object:
* @client: an #ECalClient
* @uid: UID of the object to remove
- * @rid: Recurrence ID of the specific recurrence to remove
+ * @rid: (nullable): Recurrence ID of the specific recurrence to remove
* @mod: Type of the removal
- * @opflags: bit-or of #ECalOperationFlags
+ * @opflags: (type ECalOperationFlags): bit-or of #ECalOperationFlags
* @cancellable: a #GCancellable; can be %NULL
* @callback: callback to call when a result is ready
* @user_data: user data for the @callback
@@ -5317,7 +5317,7 @@ e_cal_client_remove_object (ECalClient *client,
* e_cal_client_remove_object_finish:
* @client: an #ECalClient
* @result: a #GAsyncResult
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_cal_client_remove_object().
*
@@ -5347,11 +5347,11 @@ e_cal_client_remove_object_finish (ECalClient *client,
* e_cal_client_remove_object_sync:
* @client: an #ECalClient
* @uid: UID of the object to remove
- * @rid: Recurrence ID of the specific recurrence to remove
+ * @rid: (nullable): Recurrence ID of the specific recurrence to remove
* @mod: Type of the removal
- * @opflags: bit-or of #ECalOperationFlags
+ * @opflags: (type ECalOperationFlags): bit-or of #ECalOperationFlags
* @cancellable: a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* This function allows the removal of instances of a recurrent
* appointment. By using a combination of the @uid, @rid and @mod
@@ -5480,7 +5480,7 @@ e_cal_client_remove_objects (ECalClient *client,
* e_cal_client_remove_objects_finish:
* @client: an #ECalClient
* @result: a #GAsyncResult
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_cal_client_remove_objects().
*
@@ -5512,9 +5512,9 @@ e_cal_client_remove_objects_finish (ECalClient *client,
* @ids: (element-type ECalComponentId): a list of #ECalComponentId objects
* identifying the objects to remove
* @mod: Type of the removal
- * @opflags: bit-or of #ECalOperationFlags
- * @cancellable: (allow-none): a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @opflags: (type ECalOperationFlags): bit-or of #ECalOperationFlags
+ * @cancellable: a #GCancellable; can be %NULL
+ * @error: a #GError to set an error, if any
*
* This function allows the removal of instances of recurrent
* appointments. #ECalComponentId objects can identify specific instances
@@ -5701,7 +5701,7 @@ e_cal_client_receive_objects (ECalClient *client,
* e_cal_client_receive_objects_finish:
* @client: an #ECalClient
* @result: a #GAsyncResult
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_cal_client_receive_objects().
*
@@ -5733,7 +5733,7 @@ e_cal_client_receive_objects_finish (ECalClient *client,
* @icalcomp: An #ICalComponent
* @opflags: bit-or of #ECalOperationFlags
* @cancellable: a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Makes the backend receive the set of iCalendar objects specified in the
* @icalcomp argument. This is used for iTIP confirmation/cancellation
@@ -5862,7 +5862,7 @@ e_cal_client_send_objects (ECalClient *client,
* @out_users: (out) (transfer full) (element-type utf8): List of users to send
* the @out_modified_icalcomp to
* @out_modified_icalcomp: (out) (transfer full): Return value for the #ICalComponent to be sent
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_cal_client_send_objects() and
* populates @out_users with a list of users to send @out_modified_icalcomp to.
@@ -5914,12 +5914,12 @@ e_cal_client_send_objects_finish (ECalClient *client,
* e_cal_client_send_objects_sync:
* @client: an #ECalClient
* @icalcomp: An #ICalComponent to be sent
- * @opflags: bit-or of #ECalOperationFlags
+ * @opflags: (type ECalOperationFlags): bit-or of #ECalOperationFlags
* @out_users: (out) (transfer full) (element-type utf8): List of users to send the
* @out_modified_icalcomp to
* @out_modified_icalcomp: (out) (transfer full): Return value for the #ICalComponent to be sent
- * @cancellable: (allow-none): a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @cancellable: a #GCancellable; can be %NULL
+ * @error: a #GError to set an error, if any
*
* Requests a calendar backend to send meeting information stored in @icalcomp.
* The backend can modify this component and request a send to users in the
@@ -6040,7 +6040,7 @@ cal_client_get_attachment_uris_thread (GSimpleAsyncResult *simple,
* e_cal_client_get_attachment_uris:
* @client: an #ECalClient
* @uid: Unique identifier for a calendar component
- * @rid: Recurrence identifier
+ * @rid: (nullable): Recurrence identifier
* @cancellable: a #GCancellable; can be %NULL
* @callback: callback to call when a result is ready
* @user_data: user data for the @callback
@@ -6092,7 +6092,7 @@ e_cal_client_get_attachment_uris (ECalClient *client,
* @result: a #GAsyncResult
* @out_attachment_uris: (out) (element-type utf8): Return location for the
* list of attachment URIs
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_cal_client_get_attachment_uris() and
* sets @out_attachment_uris to uris for component's attachments.
@@ -6134,11 +6134,11 @@ e_cal_client_get_attachment_uris_finish (ECalClient *client,
* e_cal_client_get_attachment_uris_sync:
* @client: an #ECalClient
* @uid: Unique identifier for a calendar component
- * @rid: Recurrence identifier
+ * @rid: (nullable): Recurrence identifier
* @out_attachment_uris: (out) (element-type utf8): Return location for the
* list of attachment URIs
- * @cancellable: (allow-none): a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @cancellable: a #GCancellable; can be %NULL
+ * @error: a #GError to set an error, if any
*
* Queries a calendar for a specified component's object attachment URIs.
* The list should be freed with e_client_util_free_string_slist().
@@ -6239,9 +6239,9 @@ cal_client_discard_alarm_thread (GSimpleAsyncResult *simple,
* e_cal_client_discard_alarm:
* @client: an #ECalClient
* @uid: Unique identifier for a calendar component
- * @rid: Recurrence identifier
+ * @rid: (nullable): Recurrence identifier
* @auid: Alarm identifier to discard
- * @opflags: bit-or of #ECalOperationFlags
+ * @opflags: (type ECalOperationFlags): bit-or of #ECalOperationFlags
* @cancellable: a #GCancellable; can be %NULL
* @callback: callback to call when a result is ready
* @user_data: user data for the @callback
@@ -6296,7 +6296,7 @@ e_cal_client_discard_alarm (ECalClient *client,
* e_cal_client_discard_alarm_finish:
* @client: an #ECalClient
* @result: a #GAsyncResult
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_cal_client_discard_alarm().
*
@@ -6326,11 +6326,11 @@ e_cal_client_discard_alarm_finish (ECalClient *client,
* e_cal_client_discard_alarm_sync:
* @client: an #ECalClient
* @uid: Unique identifier for a calendar component
- * @rid: Recurrence identifier
+ * @rid: (nullable): Recurrence identifier
* @auid: Alarm identifier to discard
- * @opflags: bit-or of #ECalOperationFlags
+ * @opflags: (type ECalOperationFlags): bit-or of #ECalOperationFlags
* @cancellable: a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Discards alarm @auid from a given component identified by @uid and @rid.
*
@@ -6489,8 +6489,8 @@ e_cal_client_get_view (ECalClient *client,
* e_cal_client_get_view_finish:
* @client: an #ECalClient
* @result: a #GAsyncResult
- * @out_view: (out): an #ECalClientView
- * @error: (out): a #GError to set an error, if any
+ * @out_view: (out) (transfer full): an #ECalClientView
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_cal_client_get_view().
* If successful, then the @out_view is set to newly allocated #ECalClientView,
@@ -6534,7 +6534,7 @@ e_cal_client_get_view_finish (ECalClient *client,
* @sexp: an S-expression representing the query.
* @out_view: (out): an #ECalClientView
* @cancellable: a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Query @client with @sexp, creating an #ECalClientView.
* If successful, then the @out_view is set to newly allocated #ECalClientView,
@@ -6654,7 +6654,7 @@ e_cal_client_get_timezone (ECalClient *client,
* @client: an #ECalClient
* @result: a #GAsyncResult
* @out_zone: (out) (transfer none): Return value for the timezone
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_cal_client_get_timezone() and
* sets @out_zone to a retrieved timezone object from the calendar backend.
@@ -6700,7 +6700,7 @@ e_cal_client_get_timezone_finish (ECalClient *client,
* @tzid: ID of the timezone to retrieve
* @out_zone: (out) (transfer none): Return value for the timezone
* @cancellable: a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Retrieves a timezone object from the calendar backend.
* This object is owned by the @client, thus do not free it.
@@ -6880,7 +6880,7 @@ e_cal_client_add_timezone (ECalClient *client,
* e_cal_client_add_timezone_finish:
* @client: an #ECalClient
* @result: a #GAsyncResult
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_cal_client_add_timezone().
*
@@ -6911,7 +6911,7 @@ e_cal_client_add_timezone_finish (ECalClient *client,
* @client: an #ECalClient
* @zone: The timezone to add
* @cancellable: a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Add a VTIMEZONE object to the given calendar client.
*
diff --git a/src/calendar/libecal/e-cal-recur.c b/src/calendar/libecal/e-cal-recur.c
index 33e507523..34b90dab4 100644
--- a/src/calendar/libecal/e-cal-recur.c
+++ b/src/calendar/libecal/e-cal-recur.c
@@ -363,7 +363,7 @@ intersects_interval (const ICalTime *tt,
* @get_tz_callback_user_data: (closure get_tz_callback): user data for @get_tz_callback
* @default_timezone: a default #ICalTimezone
* @cancellable: a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Calls the given callback function for each occurrence of the event that
* intersects the range between the given @start and @end times (the end time is
diff --git a/src/libebackend/e-backend.c b/src/libebackend/e-backend.c
index fa30bc250..a5abd3a5e 100644
--- a/src/libebackend/e-backend.c
+++ b/src/libebackend/e-backend.c
@@ -1099,7 +1099,7 @@ e_backend_ref_main_context (EBackend *backend)
* @reason: an #ESourceCredentialsReason, why the credentials are required
* @certificate_pem: PEM-encoded secure connection certificate, or an empty string
* @certificate_errors: a bit-or of #GTlsCertificateFlags for secure connection certificate
- * @op_error: (allow-none): a #GError with a description of the previous credentials error, or %NULL
+ * @op_error: (nullable): a #GError with a description of the previous credentials error, or %NULL
* @cancellable: optional #GCancellable object, or %NULL
* @error: return location for a #GError, or %NULL
*
@@ -1183,9 +1183,9 @@ backend_credentials_required_thread (GTask *task,
* @reason: an #ESourceCredentialsReason, why the credentials are required
* @certificate_pem: PEM-encoded secure connection certificate, or an empty string
* @certificate_errors: a bit-or of #GTlsCertificateFlags for secure connection certificate
- * @op_error: (allow-none): a #GError with a description of the previous credentials error, or %NULL
+ * @op_error: (nullable): a #GError with a description of the previous credentials error, or %NULL
* @cancellable: optional #GCancellable object, or %NULL
- * @callback: (closure user_data) (scope async): a #GAsyncReadyCallback to call when the request is satisfied
+ * @callback: a #GAsyncReadyCallback to call when the request is satisfied
* @user_data: data to pass to the callback function
*
* Asynchronously calls the e_backend_credentials_required_sync() on the @backend,
@@ -1285,9 +1285,9 @@ backend_scheduled_credentials_required_done_cb (GObject *source_object,
* @reason: an #ESourceCredentialsReason, why the credentials are required
* @certificate_pem: PEM-encoded secure connection certificate, or an empty string
* @certificate_errors: a bit-or of #GTlsCertificateFlags for secure connection certificate
- * @op_error: (allow-none): a #GError with a description of the previous credentials error, or %NULL
+ * @op_error: (nullable): a #GError with a description of the previous credentials error, or %NULL
* @cancellable: optional #GCancellable object, or %NULL
- * @who_calls: (allow-none): an identification who calls this
+ * @who_calls: (nullable): an identification who calls this
*
* Asynchronously invokes e_backend_credentials_required(), but installs its
* own callback which only prints a runtime warning on the console when
@@ -1315,7 +1315,7 @@ e_backend_schedule_credentials_required (EBackend *backend,
/**
* e_backend_schedule_authenticate:
* @backend: an #EBackend
- * @credentials: (allow-none): a credentials to use to authenticate, or %NULL
+ * @credentials: (nullable): a credentials to use to authenticate, or %NULL
*
* Schedules a new authenticate session, cancelling any previously run.
* This is usually done automatically, when an 'authenticate' signal is
@@ -1400,7 +1400,7 @@ e_backend_get_user_prompter (EBackend *backend)
* e_backend_trust_prompt_sync:
* @backend: an #EBackend
* @parameters: an #ENamedParameters with values for the trust prompt
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
* @error: return location for a #GError, or %NULL
*
* Asks a user a trust prompt with given @parameters, and returns what
@@ -1453,8 +1453,8 @@ e_backend_trust_prompt_sync (EBackend *backend,
* e_backend_trust_prompt:
* @backend: an #EBackend
* @parameters: an #ENamedParameters with values for the trust prompt
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
- * @callback: (closure user_data) (scope async): a #GAsyncReadyCallback to call when the request is satisfied
+ * @cancellable: optional #GCancellable object, or %NULL
+ * @callback: a #GAsyncReadyCallback to call when the request is satisfied
* @user_data: data to pass to the callback function
*
* Initiates a user trust prompt with given @parameters.
diff --git a/src/libebackend/e-user-prompter-server-extension.c
b/src/libebackend/e-user-prompter-server-extension.c
index 88c1bd2ff..4ce148715 100644
--- a/src/libebackend/e-user-prompter-server-extension.c
+++ b/src/libebackend/e-user-prompter-server-extension.c
@@ -103,7 +103,7 @@ e_user_prompter_server_extension_init (EUserPrompterServerExtension *extension)
* @extension: an #EUserPrompterServerExtension
* @prompt_id: Prompt identificator, which is used in call to e_user_prompter_server_extension_response()
* @dialog_name: Name of a dialog to run
- * @parameters: (allow-none): Optional extension parameters for the dialog, as passed by a caller
+ * @parameters: (nullable): Optional extension parameters for the dialog, as passed by a caller
*
* Instructs extension to show dialog @dialog_name. If it cannot be found,
* or any error, then return %FALSE. The caller can pass optional @parameters,
@@ -145,7 +145,7 @@ e_user_prompter_server_extension_prompt (EUserPrompterServerExtension *extension
* @extension: an #EUserPrompterServerExtension
* @prompt_id: Prompt identificator
* @response: Response of the prompt
- * @values: (allow-none): Additional response values, if extension defines any
+ * @values: (nullable): Additional response values, if extension defines any
*
* A conveniente wrapper function around e_user_prompter_server_response(),
* which ends previous call of e_user_prompter_server_extension_prompt().
diff --git a/src/libebackend/e-user-prompter-server.c b/src/libebackend/e-user-prompter-server.c
index db8bd9612..f9febd77f 100644
--- a/src/libebackend/e-user-prompter-server.c
+++ b/src/libebackend/e-user-prompter-server.c
@@ -485,7 +485,7 @@ e_user_prompter_server_new (void)
* @server: an #EUserPrompterServer
* @prompt_id: Id of a prompt, which was responded
* @response: Response of the prompt
- * @extension_values: (allow-none): For extension prompts can pass extra return values
+ * @extension_values: (nullable): For extension prompts can pass extra return values
*
* Finishes prompt initiated by a "prompt" signal or an extension prompt.
* The @response for non-extension prompts is a 0-based index of a button
diff --git a/src/libebackend/e-user-prompter.c b/src/libebackend/e-user-prompter.c
index 84d44fd55..054a8b44f 100644
--- a/src/libebackend/e-user-prompter.c
+++ b/src/libebackend/e-user-prompter.c
@@ -316,17 +316,16 @@ user_prompter_prompt_thread (GSimpleAsyncResult *simple,
/**
* e_user_prompter_prompt:
* @prompter: an #EUserPrompter
- * @type: (allow-none): type of the prompt; can be %NULL
- * @title: (allow-none): window title of the prompt; can be %NULL
- * @primary_text: (allow-none): primary text of the prompt; can be %NULL
- * @secondary_text: (allow-none): secondary text of the prompt; can be %NULL
+ * @type: (nullable): type of the prompt; can be %NULL
+ * @title: (nullable): window title of the prompt; can be %NULL
+ * @primary_text: (nullable): primary text of the prompt; can be %NULL
+ * @secondary_text: (nullable): secondary text of the prompt; can be %NULL
* @use_markup: whether both texts are with markup
- * @button_captions: (allow-none) (element-type utf8): captions of buttons to
+ * @button_captions: (nullable) (element-type utf8): captions of buttons to
* use in the message; can be %NULL
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request
- * is satisfied
- * @user_data: (closure): data to pass to the callback function
+ * @cancellable: optional #GCancellable object, or %NULL
+ * @callback: a #GAsyncReadyCallback to call when the request is satisfied
+ * @user_data: data to pass to the callback function
*
* Asynchronously prompt a user for a decision.
*
@@ -424,14 +423,14 @@ e_user_prompter_prompt_finish (EUserPrompter *prompter,
/**
* e_user_prompter_prompt_sync:
* @prompter: an #EUserPrompter
- * @type: (allow-none): type of the prompt; can be %NULL
- * @title: (allow-none): window title of the prompt; can be %NULL
- * @primary_text: (allow-none): primary text of the prompt; can be %NULL
- * @secondary_text: (allow-none): secondary text of the prompt; can be %NULL
+ * @type: (nullable): type of the prompt; can be %NULL
+ * @title: (nullable): window title of the prompt; can be %NULL
+ * @primary_text: (nullable): primary text of the prompt; can be %NULL
+ * @secondary_text: (nullable): secondary text of the prompt; can be %NULL
* @use_markup: whether both texts are with markup
- * @button_captions: (allow-none) (element-type utf8): captions of buttons to
+ * @button_captions: (nullable) (element-type utf8): captions of buttons to
* use in the message; can be %NULL
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
* @error: return location for a #GError, or %NULL
*
* Prompts a user for a decision.
@@ -487,11 +486,10 @@ e_user_prompter_prompt_sync (EUserPrompter *prompter,
* e_user_prompter_extension_prompt:
* @prompter: an #EUserPrompter
* @dialog_name: name of a dialog to invoke
- * @in_parameters: (allow-none): optional parameters to pass to extension; can be %NULL
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request
- * is satisfied
- * @user_data: (closure): data to pass to the callback function
+ * @in_parameters: (nullable): optional parameters to pass to extension; can be %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
+ * @callback: a #GAsyncReadyCallback to call when the request is satisfied
+ * @user_data: data to pass to the callback function
*
* Asynchronously prompt a user for a decision on an extension-provided dialog.
* The caller usually provides an extension for #EUserPrompterServer, a descendant
@@ -552,7 +550,7 @@ e_user_prompter_extension_prompt (EUserPrompter *prompter,
* e_user_prompter_extension_prompt_finish:
* @prompter: an #EUserPrompter
* @result: a #GAsyncResult
- * @out_values: (allow-none): Where to store values from the extension, or %NULL
+ * @out_values: (nullable): Where to store values from the extension, or %NULL
* @error: return location for a #GError, or %NULL
*
* Finishes the operation started with e_user_prompter_extension_prompt().
@@ -600,9 +598,9 @@ e_user_prompter_extension_prompt_finish (EUserPrompter *prompter,
* e_user_prompter_extension_prompt_sync:
* @prompter: an #EUserPrompter
* @dialog_name: name of a dialog to invoke
- * @in_parameters: (allow-none): optional parameters to pass to extension; can be %NULL
- * @out_values: (allow-none): Where to store values from the extension, or %NULL
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @in_parameters: (nullable): optional parameters to pass to extension; can be %NULL
+ * @out_values: (nullable): Where to store values from the extension, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
* @error: return location for a #GError, or %NULL
*
* Synchronously prompt a user for a decision on an extension-provided dialog.
diff --git a/src/libedataserver/e-cancellable-locks.c b/src/libedataserver/e-cancellable-locks.c
index e7f5e1c9c..fd8cd1118 100644
--- a/src/libedataserver/e-cancellable-locks.c
+++ b/src/libedataserver/e-cancellable-locks.c
@@ -86,7 +86,7 @@ e_cancellable_mutex_clear (ECancellableMutex *mutex)
/**
* e_cancellable_mutex_lock:
* @mutex: an #ECancellableMutex instance
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: a #GCancellable, or %NULL
*
* Acquires lock on @mutex. The returned value indicates whether
* the lock was acquired, while %FALSE is returned only either or
@@ -233,7 +233,7 @@ e_cancellable_rec_mutex_clear (ECancellableRecMutex *rec_mutex)
/**
* e_cancellable_rec_mutex_lock:
* @rec_mutex: an #ECancellableRecMutex instance
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: a #GCancellable, or %NULL
*
* Acquires lock on @rec_mutex. The returned value indicates whether
* the lock was acquired, while %FALSE is returned only either or
diff --git a/src/libedataserver/e-client.c b/src/libedataserver/e-client.c
index bc166cabd..5edb17785 100644
--- a/src/libedataserver/e-client.c
+++ b/src/libedataserver/e-client.c
@@ -1285,7 +1285,7 @@ e_client_retrieve_capabilities (EClient *client,
* @client: an #EClient
* @result: a #GAsyncResult
* @capabilities: (out): Comma-separated list of capabilities of the @client
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_client_retrieve_capabilities().
* Returned value of @capabilities should be freed with g_free(),
@@ -1327,7 +1327,7 @@ e_client_retrieve_capabilities_finish (EClient *client,
* @client: an #EClient
* @capabilities: (out): Comma-separated list of capabilities of the @client
* @cancellable: a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Initiates retrieval of capabilities on the @client. This is usually
* required only once, after the @client is opened. The returned value
@@ -1406,7 +1406,7 @@ e_client_get_backend_property (EClient *client,
* @client: an #EClient
* @result: a #GAsyncResult
* @prop_value: (out): Retrieved backend property value; cannot be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_client_get_backend_property().
*
@@ -1439,7 +1439,7 @@ e_client_get_backend_property_finish (EClient *client,
* @prop_name: property name, whose value to retrieve; cannot be %NULL
* @prop_value: (out): Retrieved backend property value; cannot be %NULL
* @cancellable: a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Queries @client's backend for a property of name @prop_name.
*
@@ -1514,7 +1514,7 @@ e_client_set_backend_property (EClient *client,
* e_client_set_backend_property_finish:
* @client: an #EClient
* @result: a #GAsyncResult
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_client_set_backend_property().
*
@@ -1547,7 +1547,7 @@ e_client_set_backend_property_finish (EClient *client,
* @prop_name: property name, whose value to change; cannot be %NULL
* @prop_value: property value, to set; cannot be %NULL
* @cancellable: a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Sets @client's backend property of name @prop_name
* to value @prop_value.
@@ -1621,7 +1621,7 @@ e_client_open (EClient *client,
* e_client_open_finish:
* @client: an #EClient
* @result: a #GAsyncResult
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_client_open().
*
@@ -1655,7 +1655,7 @@ e_client_open_finish (EClient *client,
* @client: an #EClient
* @only_if_exists: this parameter is not used anymore
* @cancellable: a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Opens the @client, making it ready for queries and other operations.
*
@@ -1718,7 +1718,7 @@ e_client_remove (EClient *client,
* e_client_remove_finish:
* @client: an #EClient
* @result: a #GAsyncResult
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_client_remove().
*
@@ -1748,7 +1748,7 @@ e_client_remove_finish (EClient *client,
* e_client_remove_sync:
* @client: an #EClient
* @cancellable: a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Removes the backing data for this #EClient. For example, with the file
* backend this deletes the database file. You cannot get it back!
@@ -1810,7 +1810,7 @@ e_client_refresh (EClient *client,
* e_client_refresh_finish:
* @client: an #EClient
* @result: a #GAsyncResult
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Finishes previous call of e_client_refresh().
*
@@ -1838,7 +1838,7 @@ e_client_refresh_finish (EClient *client,
* e_client_refresh_sync:
* @client: an #EClient
* @cancellable: a #GCancellable; can be %NULL
- * @error: (out): a #GError to set an error, if any
+ * @error: a #GError to set an error, if any
*
* Initiates refresh on the @client. Finishing the method doesn't mean
* that the refresh is done, backend only notifies whether it started
@@ -1887,7 +1887,7 @@ client_wait_for_connected_thread (GTask *task,
* e_client_wait_for_connected:
* @client: an #EClient
* @timeout_seconds: a timeout for the wait, in seconds
- * @cancellable: (allow-none): a #GCancellable; or %NULL
+ * @cancellable: a #GCancellable; or %NULL
* @callback: callback to call when a result is ready
* @user_data: user data for the @callback
*
@@ -1923,7 +1923,7 @@ e_client_wait_for_connected (EClient *client,
* e_client_wait_for_connected_finish:
* @client: an #EClient
* @result: a #GAsyncResult
- * @error: (out) (allow-none): a #GError to set an error, or %NULL
+ * @error: a #GError to set an error, or %NULL
*
* Finishes previous call of e_client_wait_for_connected().
*
@@ -1970,8 +1970,8 @@ client_wait_for_connected_notify_cb (ESource *source,
* e_client_wait_for_connected_sync:
* @client: an #EClient
* @timeout_seconds: a timeout for the wait, in seconds
- * @cancellable: (allow-none): a #GCancellable; or %NULL
- * @error: (out) (allow-none): a #GError to set an error, or %NULL
+ * @cancellable: a #GCancellable; or %NULL
+ * @error: a #GError to set an error, or %NULL
*
* Synchronously waits until the @client is connected (according
* to @ESource::connection-status property), but not longer than @timeout_seconds.
@@ -2044,8 +2044,8 @@ e_client_wait_for_connected_sync (EClient *client,
/**
* e_client_retrieve_properties_sync:
* @client: an #EClient
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
- * @error: (allow-none): return location for a #GError, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
+ * @error: return location for a #GError, or %NULL
*
* Retrieves @client properties to match server-side values, without waiting
* for the D-Bus property change notifications delivery.
@@ -2093,7 +2093,7 @@ client_retrieve_properties_thread (GTask *task,
/**
* e_client_retrieve_properties:
* @client: an #EClient
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
* @callback: a #GAsyncReadyCallback to call when the request is satisfied
* @user_data: data to pass to the callback function
*
@@ -2197,7 +2197,7 @@ e_client_util_strv_to_slist (const gchar * const *strv)
/**
* e_client_util_copy_string_slist:
- * @copy_to: (element-type utf8) (allow-none): Where to copy; may be %NULL
+ * @copy_to: (element-type utf8) (nullable) (transfer full): Where to copy; may be %NULL
* @strings: (element-type utf8): #GSList of strings to be copied
*
* Copies the #GSList of strings to the end of @copy_to.
@@ -2218,7 +2218,7 @@ e_client_util_copy_string_slist (GSList *copy_to,
/**
* e_client_util_copy_object_slist:
- * @copy_to: (element-type GObject) (allow-none): Where to copy; may be %NULL
+ * @copy_to: (element-type GObject) (nullable) (transfer full): Where to copy; may be %NULL
* @objects: (element-type GObject): #GSList of #GObject<!-- -->s to be copied
*
* Copies a #GSList of #GObject<!-- -->s to the end of @copy_to.
diff --git a/src/libedataserver/e-collator.c b/src/libedataserver/e-collator.c
index ec2cf7951..3bb4574a1 100644
--- a/src/libedataserver/e-collator.c
+++ b/src/libedataserver/e-collator.c
@@ -292,7 +292,7 @@ convert_to_ustring (const gchar *string,
/**
* e_collator_new:
* @locale: The locale under which to sort
- * @error: (allow-none): A location to store a #GError from the #E_COLLATOR_ERROR domain
+ * @error: A location to store a #GError from the #E_COLLATOR_ERROR domain
*
* Creates a new #ECollator for the given @locale,
* the returned collator should be freed with e_collator_unref().
@@ -311,8 +311,8 @@ e_collator_new (const gchar *locale,
/**
* e_collator_new_interpret_country:
* @locale: The locale under which to sort
- * @country_code: (allow-none) (out) (transfer full): A location to store the interpreted country code from
@locale
- * @error: (allow-none): A location to store a #GError from the #E_COLLATOR_ERROR domain
+ * @country_code: (optional) (out) (transfer full): A location to store the interpreted country code from
@locale
+ * @error: A location to store a #GError from the #E_COLLATOR_ERROR domain
*
* Creates a new #ECollator for the given @locale,
* the returned collator should be freed with e_collator_unref().
@@ -455,7 +455,7 @@ e_collator_unref (ECollator *collator)
* e_collator_generate_key:
* @collator: An #ECollator
* @str: The string to generate a collation key for
- * @error: (allow-none): A location to store a #GError from the #E_COLLATOR_ERROR domain
+ * @error: A location to store a #GError from the #E_COLLATOR_ERROR domain
*
* Generates a collation key for @str, the result of comparing
* two collation keys with strcmp() will be the same result
@@ -591,10 +591,10 @@ e_collator_generate_key_for_index (ECollator *collator,
/**
* e_collator_collate:
* @collator: An #ECollator
- * @str_a: (allow-none): A string to compare
- * @str_b: (allow-none): The string to compare with @str_a
+ * @str_a: (nullable): A string to compare
+ * @str_b: (nullable): The string to compare with @str_a
* @result: (out): A location to store the comparison result
- * @error: (allow-none): A location to store a #GError from the #E_COLLATOR_ERROR domain
+ * @error: A location to store a #GError from the #E_COLLATOR_ERROR domain
*
* Compares @str_a with @str_b, the order of strings is determined by the parameters of @collator.
*
@@ -648,9 +648,9 @@ e_collator_collate (ECollator *collator,
* e_collator_get_index_labels:
* @collator: An #ECollator
* @n_labels: (out): The number of labels/indexes available for @collator
- * @underflow: (allow-none) (out): The underflow index, for any words which sort below the active alphabet(s)
- * @inflow: (allow-none) (out): The inflow index, for any words which sort between the active alphabets (if
there is more than one)
- * @overflow: (allow-none) (out): The overflow index, for any words which sort above the active alphabet(s)
+ * @underflow: (optional) (out): The underflow index, for any words which sort below the active alphabet(s)
+ * @inflow: (optional) (out): The inflow index, for any words which sort between the active alphabets (if
there is more than one)
+ * @overflow: (optional) (out): The overflow index, for any words which sort above the active alphabet(s)
*
* Fetches the displayable labels and index positions for the active alphabet.
*
diff --git a/src/libedataserver/e-data-server-util.c b/src/libedataserver/e-data-server-util.c
index eb762120f..d52809bd7 100644
--- a/src/libedataserver/e-data-server-util.c
+++ b/src/libedataserver/e-data-server-util.c
@@ -132,8 +132,8 @@ e_get_user_data_dir (void)
/**
* e_util_strv_equal:
- * @v1: (allow-none): a %NULL-terminated string array, or %NULL
- * @v2: (allow-none): another %NULL-terminated string array, or %NULL
+ * @v1: (array zero-terminated=1) (element-type utf8): a %NULL-terminated string array, or %NULL
+ * @v2: (array zero-terminated=1) (element-type utf8): another %NULL-terminated string array, or %NULL
*
* Compares @v1 and @v2 for equality, handling %NULL gracefully.
*
@@ -173,7 +173,7 @@ e_util_strv_equal (gconstpointer v1,
/**
* e_util_strdup_strip:
- * @string: (allow-none): a string value, or %NULL
+ * @string: (nullable): a string value, or %NULL
*
* Duplicates @string and strips off any leading or trailing whitespace.
* The resulting string is returned unless it is empty or %NULL, in which
@@ -181,7 +181,7 @@ e_util_strv_equal (gconstpointer v1,
*
* Free the returned string with g_free().
*
- * Returns: a newly-allocated, stripped copy of @string, or %NULL
+ * Returns: (nullable): a newly-allocated, stripped copy of @string, or %NULL
*
* Since: 3.6
**/
@@ -204,8 +204,8 @@ e_util_strdup_strip (const gchar *string)
/**
* e_util_strcmp0:
- * @str1: a C string on %NULL
- * @str2: another C string or %NULL
+ * @str1: (nullable): a C string on %NULL
+ * @str2: (nullable): another C string or %NULL
*
* Compares @str1 and @str2 like g_strcmp0(), except it handles %NULL and
* empty strings as equal.
@@ -236,7 +236,7 @@ e_util_strcmp0 (const gchar *str1,
* Find the first instance of @needle in @haystack, ignoring case for
* bytes that are ASCII characters.
*
- * Returns: A pointer to the start of @needle in @haystack, or NULL if
+ * Returns: (nullable): A pointer to the start of @needle in @haystack, or NULL if
* @needle is not found.
**/
gchar *
@@ -271,7 +271,7 @@ e_util_strstrcase (const gchar *haystack,
*
* Get a UTF-8 character from the beginning of @text.
*
- * Returns: A pointer to the next character in @text after @out.
+ * Returns: (nullable): A pointer to the next character in @text after @out.
**/
gchar *
e_util_unicode_get_utf8 (const gchar *text,
@@ -286,14 +286,14 @@ e_util_unicode_get_utf8 (const gchar *text,
/**
* e_util_utf8_strstrcase:
- * @haystack: The string to search in.
- * @needle: The string to search for.
+ * @haystack: (nullable): The string to search in.
+ * @needle: (nullable): The string to search for.
*
* Find the first instance of @needle in @haystack, ignoring case. (No
* proper case folding or decomposing is done.) Both @needle and
* @haystack are UTF-8 strings.
*
- * Returns: A pointer to the first instance of @needle in @haystack, or
+ * Returns: (nullable): A pointer to the first instance of @needle in @haystack, or
* %NULL if no match is found, or if either of the strings are
* not legal UTF-8 strings.
**/
@@ -664,11 +664,11 @@ e_util_utf8_data_make_valid (const gchar *data,
/**
* e_util_utf8_normalize:
- * @str: a UTF-8 string
+ * @str: (nullable): a UTF-8 string
*
* Normalizes @str by making it all lower case and removing any accents from it.
*
- * Returns: The normalized version of @str, or %NULL if @str was not valid UTF-8
+ * Returns: (nullable): The normalized version of @str, or %NULL if @str was not valid UTF-8
*
* Since: 3.8
*/
@@ -1070,7 +1070,7 @@ e_util_strv_to_slist (const gchar * const *strv)
/**
* e_util_copy_string_slist:
- * @copy_to: (element-type utf8) (allow-none): Where to copy; can be %NULL
+ * @copy_to: (element-type utf8) (nullable) (transfer full): Where to copy; can be %NULL
* @strings: (element-type utf8): #GSList of strings to be copied
*
* Copies #GSList of strings at the end of @copy_to.
@@ -1098,7 +1098,7 @@ e_util_copy_string_slist (GSList *copy_to,
/**
* e_util_copy_object_slist:
- * @copy_to: (element-type GObject) (allow-none): Where to copy; can be %NULL
+ * @copy_to: (element-type GObject) (nullable) (transfer full): Where to copy; can be %NULL
* @objects: (element-type GObject): #GSList of #GObject<!-- -->s to be copied
*
* Copies #GSList of #GObject<!-- -->s at the end of @copy_to.
@@ -1226,7 +1226,7 @@ e_queue_transfer (GQueue *src_queue,
/**
* e_weak_ref_new: (skip)
- * @object: (allow-none): a #GObject or %NULL
+ * @object: (nullable): a #GObject or %NULL
*
* Allocates a new #GWeakRef and calls g_weak_ref_set() with @object.
*
@@ -1412,7 +1412,7 @@ e_file_recursive_delete (GFile *file,
/**
* e_file_recursive_delete_finish:
* @file: a #GFile to delete
- * @result: (transfer full): a #GAsyncResult
+ * @result: a #GAsyncResult
* @error: return location for a #GError, or %NULL
*
* Finishes the operation started with e_file_recursive_delete().
@@ -1473,9 +1473,9 @@ e_binding_bind_property (gpointer source,
* @target: (type GObject.Object): the target #GObject
* @target_property: the property on @target to bind
* @flags: flags to pass to #GBinding
- * @transform_to: (scope notified) (allow-none): the transformation function
+ * @transform_to: (scope notified) (nullable): the transformation function
* from the @source to the @target, or %NULL to use the default
- * @transform_from: (scope notified) (allow-none): the transformation function
+ * @transform_from: (scope notified) (nullable): the transformation function
* from the @target to the @source, or %NULL to use the default
* @user_data: custom data to be passed to the transformation functions,
* or %NULL
@@ -1513,9 +1513,9 @@ e_binding_bind_property_full (gpointer source,
* @target: (type GObject.Object): the target #GObject
* @target_property: the property on @target to bind
* @flags: flags to pass to #GBinding
- * @transform_to: a #GClosure wrapping the transformation function
+ * @transform_to: (nullable): a #GClosure wrapping the transformation function
* from the @source to the @target, or %NULL to use the default
- * @transform_from: a #GClosure wrapping the transformation function
+ * @transform_from: (nullable): a #GClosure wrapping the transformation function
* from the @target to the @source, or %NULL to use the default
*
* Thread safe variant of g_object_bind_property_with_closures(). See its
@@ -2355,7 +2355,7 @@ e_named_parameters_clear (ENamedParameters *parameters)
/**
* e_named_parameters_assign:
* @parameters: an #ENamedParameters to assign values to
- * @from: (allow-none): an #ENamedParameters to get values from, or %NULL
+ * @from: (nullable): an #ENamedParameters to get values from, or %NULL
*
* Makes content of the @parameters the same as @from.
* Functions clears content of @parameters if @from is %NULL.
@@ -2416,7 +2416,7 @@ get_parameter_index (const ENamedParameters *parameters,
* e_named_parameters_set:
* @parameters: an #ENamedParameters
* @name: name of a parameter to set
- * @value: (allow-none): value to set, or %NULL to unset
+ * @value: (nullable): value to set, or %NULL to unset
*
* Sets parameter named @name to value @value. If @value is NULL,
* then the parameter is removed. @value can be an empty string.
@@ -2466,7 +2466,7 @@ e_named_parameters_set (ENamedParameters *parameters,
* Returns current value of a parameter with name @name. If not such
* exists, then returns %NULL.
*
- * Returns: value of a parameter named @name, or %NULL.
+ * Returns: (nullable): value of a parameter named @name, or %NULL.
*
* Since: 3.8
**/
@@ -2557,7 +2557,7 @@ e_named_parameters_to_strv (const ENamedParameters *parameters)
* e_named_parameters_to_string:
* @parameters: an #ENamedParameters
*
- * Returns: (transfer full): Contents of @parameters as a string
+ * Returns: (transfer full) (nullable): Contents of @parameters as a string
*
* Since: 3.18
*/
@@ -2625,7 +2625,7 @@ e_named_parameters_count (const ENamedParameters *parameters)
* @parameters: an #ENamedParameters
* @index: an index of the parameter whose name to retrieve
*
- * Returns: (transfer full): The name of the parameters at index @index,
+ * Returns: (transfer full) (nullable): The name of the parameters at index @index,
* or %NULL, of the @index is out of bounds or other error. The returned
* string should be freed with g_free() when done with it.
*
@@ -2741,10 +2741,10 @@ G_DEFINE_BOXED_TYPE (
* range between #G_PRIORITY_DEFAULT and #G_PRIORITY_HIGH
* @interval: the time between calls to the function, in milliseconds
* (1/1000ths of a second)
- * @name: (allow-none): debug name for the source
+ * @name: (nullable): debug name for the source
* @function: function to call
* @data: data to pass to @function
- * @notify: (allow-none): function to call when the timeout is removed,
+ * @notify: (nullable): function to call when the timeout is removed,
* or %NULL
*
* Similar to g_timeout_add_full(), but also names the #GSource as @name.
@@ -2780,10 +2780,10 @@ e_timeout_add_with_name (gint priority,
* @priority: the priority of the timeout source, typically in the
* range between #G_PRIORITY_DEFAULT and #G_PRIORITY_HIGH
* @interval: the time between calls to the function, in seconds
- * @name: (allow-none): debug name for the source
+ * @name: (nullable): debug name for the source
* @function: function to call
* @data: data to pass to @function
- * @notify: (allow-none): function to call when the timeout is removed,
+ * @notify: (nullable): function to call when the timeout is removed,
* or %NULL
*
* Similar to g_timeout_add_seconds_full(), but also names the #GSource as
diff --git a/src/libedataserver/e-source-alarms.c b/src/libedataserver/e-source-alarms.c
index c7aa93fe6..4c4e400d3 100644
--- a/src/libedataserver/e-source-alarms.c
+++ b/src/libedataserver/e-source-alarms.c
@@ -265,7 +265,7 @@ e_source_alarms_dup_last_notified (ESourceAlarms *extension)
/**
* e_source_alarms_set_last_notified:
* @extension: an #ESourceAlarms
- * @last_notified: (allow-none): an ISO 8601 timestamp, or %NULL
+ * @last_notified: (nullable): an ISO 8601 timestamp, or %NULL
*
* Sets an ISO 8601 formatted timestamp of when the user was last
* alerted about an upcoming appointment in the calendar described
diff --git a/src/libedataserver/e-source-authentication.c b/src/libedataserver/e-source-authentication.c
index 7bbf36eb9..dbb702353 100644
--- a/src/libedataserver/e-source-authentication.c
+++ b/src/libedataserver/e-source-authentication.c
@@ -440,7 +440,7 @@ e_source_authentication_required (ESourceAuthentication *extension)
* The returned #GSocketConnectable is referenced for thread-safety and must
* be unreferenced with g_object_unref() when finished with it.
*
- * Returns: (transfer full): a #GSocketConnectable, or %NULL
+ * Returns: (transfer full) (nullable): a #GSocketConnectable, or %NULL
*
* Since: 3.8
**/
@@ -467,7 +467,7 @@ e_source_authentication_ref_connectable (ESourceAuthentication *extension)
*
* Returns the host name used to authenticate to a remote account.
*
- * Returns: the host name of a remote account
+ * Returns: (nullable): the host name of a remote account
*
* Since: 3.6
**/
@@ -488,7 +488,7 @@ e_source_authentication_get_host (ESourceAuthentication *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESourceAuthentication:host
+ * Returns: (nullable): a newly-allocated copy of #ESourceAuthentication:host
*
* Since: 3.6
**/
@@ -513,7 +513,7 @@ e_source_authentication_dup_host (ESourceAuthentication *extension)
/**
* e_source_authentication_set_host:
* @extension: an #ESourceAuthentication
- * @host: (allow-none): a host name, or %NULL
+ * @host: (nullable): a host name, or %NULL
*
* Sets the host name used to authenticate to a remote account.
*
@@ -558,7 +558,7 @@ e_source_authentication_set_host (ESourceAuthentication *extension,
* they wish. If authentication is not required for a remote account,
* the convention is to set #ESourceAuthentication:method to "none".
*
- * Returns: the authentication method for a remote account
+ * Returns: (nullable): the authentication method for a remote account
*
* Since: 3.6
**/
@@ -579,7 +579,7 @@ e_source_authentication_get_method (ESourceAuthentication *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESourceAuthentication:method
+ * Returns: (nullable): a newly-allocated copy of #ESourceAuthentication:method
*
* Since: 3.6
**/
@@ -604,7 +604,7 @@ e_source_authentication_dup_method (ESourceAuthentication *extension)
/**
* e_source_authentication_set_method:
* @extension: an #ESourceAuthentication
- * @method: (allow-none): authentication method, or %NULL
+ * @method: (nullable): authentication method, or %NULL
*
* Sets the authentication method for a remote account. There are no
* pre-defined method names; backends are free to set this however they
@@ -824,7 +824,7 @@ e_source_authentication_set_remember_password (ESourceAuthentication *extension,
*
* Returns the user name used to authenticate to a remote account.
*
- * Returns: the user name of a remote account
+ * Returns: (nullable): the user name of a remote account
*
* Since: 3.6
**/
@@ -845,7 +845,7 @@ e_source_authentication_get_user (ESourceAuthentication *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESourceAuthentication:user
+ * Returns: (nullable): a newly-allocated copy of #ESourceAuthentication:user
*
* Since: 3.6
**/
@@ -870,7 +870,7 @@ e_source_authentication_dup_user (ESourceAuthentication *extension)
/**
* e_source_authentication_set_user:
* @extension: an #ESourceAuthentication
- * @user: (allow-none): a user name, or %NULL
+ * @user: (nullable): a user name, or %NULL
*
* Sets the user name used to authenticate to a remote account.
*
@@ -910,7 +910,7 @@ e_source_authentication_set_user (ESourceAuthentication *extension,
* a counterpart of the authentication method. The %NULL means to use
* the default name, which is #E_SOURCE_CREDENTIAL_PASSWORD.
*
- * Returns: the credential name to use for authentication, or %NULL
+ * Returns: (nullable): the credential name to use for authentication, or %NULL
*
* Since: 3.16
**/
@@ -931,7 +931,7 @@ e_source_authentication_get_credential_name (ESourceAuthentication *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESourceAuthentication:credential-name
+ * Returns: (nullable): a newly-allocated copy of #ESourceAuthentication:credential-name
*
* Since: 3.16
**/
@@ -956,7 +956,7 @@ e_source_authentication_dup_credential_name (ESourceAuthentication *extension)
/**
* e_source_authentication_set_credential_name:
* @extension: an #ESourceAuthentication
- * @credential_name: (allow-none): a credential name, or %NULL
+ * @credential_name: (nullable): a credential name, or %NULL
*
* Sets the credential name used to pass the stored or gathered credential
* (like password) into the e_source_invoke_authenticate(). This is
diff --git a/src/libedataserver/e-source-backend.c b/src/libedataserver/e-source-backend.c
index f1589ff55..b8092a4c5 100644
--- a/src/libedataserver/e-source-backend.c
+++ b/src/libedataserver/e-source-backend.c
@@ -131,7 +131,7 @@ e_source_backend_init (ESourceBackend *extension)
*
* Returns the backend name for @extension.
*
- * Returns: the backend name for @extension
+ * Returns: (nullable): the backend name for @extension
*
* Since: 3.6
**/
@@ -152,7 +152,7 @@ e_source_backend_get_backend_name (ESourceBackend *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESourceBackend:backend-name
+ * Returns: (nullable): a newly-allocated copy of #ESourceBackend:backend-name
*
* Since: 3.6
**/
@@ -177,7 +177,7 @@ e_source_backend_dup_backend_name (ESourceBackend *extension)
/**
* e_source_backend_set_backend_name:
* @extension: an #ESourceBackend
- * @backend_name: (allow-none): a backend name, or %NULL
+ * @backend_name: (nullable): a backend name, or %NULL
*
* Sets the backend name for @extension.
*
diff --git a/src/libedataserver/e-source-collection.c b/src/libedataserver/e-source-collection.c
index a1292987f..c59c0aaa3 100644
--- a/src/libedataserver/e-source-collection.c
+++ b/src/libedataserver/e-source-collection.c
@@ -326,7 +326,7 @@ e_source_collection_init (ESourceCollection *extension)
* Returns the string used to uniquely identify the user account at
* the service provider. Often this is an email address or user name.
*
- * Returns: the collection identity
+ * Returns: (nullable): the collection identity
*
* Since: 3.6
**/
@@ -347,7 +347,7 @@ e_source_collection_get_identity (ESourceCollection *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESourceCollection:identity
+ * Returns: (nullable): a newly-allocated copy of #ESourceCollection:identity
*
* Since: 3.6
**/
@@ -372,7 +372,7 @@ e_source_collection_dup_identity (ESourceCollection *extension)
/**
* e_source_collection_set_identity:
* @extension: an #ESourceCollection
- * @identity: (allow-none): the collection identity, or %NULL
+ * @identity: (nullable): the collection identity, or %NULL
*
* Sets the string used to uniquely identify the user account at the
* service provider. Often this is an email address or user name.
@@ -592,7 +592,7 @@ e_source_collection_get_calendar_url (ESourceCollection *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESourceCollection:calendar-url
+ * Returns: (nullable): a newly-allocated copy of #ESourceCollection:calendar-url
*
* Since: 3.26
**/
@@ -675,7 +675,7 @@ e_source_collection_get_contacts_url (ESourceCollection *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESourceCollection:contacts-url
+ * Returns: (nullable): a newly-allocated copy of #ESourceCollection:contacts-url
*
* Since: 3.26
**/
diff --git a/src/libedataserver/e-source-credentials-provider-impl.c
b/src/libedataserver/e-source-credentials-provider-impl.c
index bd5c48586..cab782eb6 100644
--- a/src/libedataserver/e-source-credentials-provider-impl.c
+++ b/src/libedataserver/e-source-credentials-provider-impl.c
@@ -207,9 +207,9 @@ e_source_credentials_provider_impl_can_prompt (ESourceCredentialsProviderImpl *p
* e_source_credentials_provider_impl_lookup_sync:
* @provider_impl: an #ESourceCredentialsProviderImpl
* @source: an #ESource
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
* @out_credentials: (out): an #ENamedParameters to be set with stored credentials
- * @error: (allow-none): return location for a #GError, or %NULL
+ * @error: return location for a #GError, or %NULL
*
* Asks @provider_impl to lookup for stored credentials for @source.
* The @out_credentials is populated with them. If the result is not
@@ -250,8 +250,8 @@ e_source_credentials_provider_impl_lookup_sync (ESourceCredentialsProviderImpl *
* @source: an #ESource
* @credentials: an #ENamedParameters containing credentials to store
* @permanently: whether to store credentials permanently, or for the current session only
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
- * @error: (allow-none): return location for a #GError, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
+ * @error: return location for a #GError, or %NULL
*
* Asks @provider_impl to store @credentials for @source.
*
@@ -288,8 +288,8 @@ e_source_credentials_provider_impl_store_sync (ESourceCredentialsProviderImpl *p
* e_source_credentials_provider_impl_delete_sync:
* @provider_impl: an #ESourceCredentialsProviderImpl
* @source: an #ESource
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
- * @error: (allow-none): return location for a #GError, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
+ * @error: return location for a #GError, or %NULL
*
* Asks @provider_impl to delete any stored credentials for @source.
*
diff --git a/src/libedataserver/e-source-goa.c b/src/libedataserver/e-source-goa.c
index 3b36011cf..4c37a1049 100644
--- a/src/libedataserver/e-source-goa.c
+++ b/src/libedataserver/e-source-goa.c
@@ -263,7 +263,7 @@ e_source_goa_init (ESourceGoa *extension)
* Returns the identifier string of the GNOME Online Account associated
* with the #ESource to which @extension belongs.
*
- * Returns: the associated GNOME Online Account ID
+ * Returns: (nullable): the associated GNOME Online Account ID
*
* Since: 3.6
**/
@@ -284,7 +284,7 @@ e_source_goa_get_account_id (ESourceGoa *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESourceGoa:account-id
+ * Returns: (nullable): a newly-allocated copy of #ESourceGoa:account-id
*
* Since: 3.6
**/
@@ -309,7 +309,7 @@ e_source_goa_dup_account_id (ESourceGoa *extension)
/**
* e_source_goa_set_account_id:
* @extension: an #ESourceGoa
- * @account_id: (allow-none): the associated GNOME Online Account ID, or %NULL
+ * @account_id: (nullable): the associated GNOME Online Account ID, or %NULL
*
* Sets the identifier string of the GNOME Online Account associated
* with the #ESource to which @extension belongs.
@@ -349,7 +349,7 @@ e_source_goa_set_account_id (ESourceGoa *extension,
* with the #ESource to which @extension belongs. Can be %NULL or an empty
* string for accounts not supporting this property.
*
- * Returns: the associated GNOME Online Account calendar URL
+ * Returns: (nullable): the associated GNOME Online Account calendar URL
*
* Since: 3.8
**/
@@ -370,7 +370,7 @@ e_source_goa_get_calendar_url (ESourceGoa *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESourceGoa:calendar-url
+ * Returns: (nullable): a newly-allocated copy of #ESourceGoa:calendar-url
*
* Since: 3.8
**/
@@ -395,7 +395,7 @@ e_source_goa_dup_calendar_url (ESourceGoa *extension)
/**
* e_source_goa_set_calendar_url:
* @extension: an #ESourceGoa
- * @calendar_url: (allow-none): the associated GNOME Online Account
+ * @calendar_url: (nullable): the associated GNOME Online Account
* calendar URL, or %NULL
*
* Sets the calendar URL of the GNOME Online Account associated
@@ -436,7 +436,7 @@ e_source_goa_set_calendar_url (ESourceGoa *extension,
* with the #ESource to which @extension belongs. Can be %NULL or an empty
* string for accounts not supporting this property.
*
- * Returns: the associated GNOME Online Account contacts URL
+ * Returns: (nullable): the associated GNOME Online Account contacts URL
*
* Since: 3.8
**/
@@ -457,7 +457,7 @@ e_source_goa_get_contacts_url (ESourceGoa *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESourceGoa:contacts-url
+ * Returns: (nullable): a newly-allocated copy of #ESourceGoa:contacts-url
*
* Since: 3.8
**/
@@ -482,7 +482,7 @@ e_source_goa_dup_contacts_url (ESourceGoa *extension)
/**
* e_source_goa_set_contacts_url:
* @extension: an #ESourceGoa
- * @contacts_url: (allow-none): the associated GNOME Online Account
+ * @contacts_url: (nullable): the associated GNOME Online Account
* contacts URL, or %NULL
*
* Sets the contacts URL of the GNOME Online Account associated
@@ -523,7 +523,7 @@ e_source_goa_set_contacts_url (ESourceGoa *extension,
* with the #ESource to which @extension belongs. Can be %NULL or an empty
* string when not filled.
*
- * Returns: the associated GNOME Online Account's Name
+ * Returns: (nullable): the associated GNOME Online Account's Name
*
* Since: 3.24
**/
@@ -544,7 +544,7 @@ e_source_goa_get_name (ESourceGoa *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESourceGoa:name
+ * Returns: (nullable): a newly-allocated copy of #ESourceGoa:name
*
* Since: 3.24
**/
@@ -609,7 +609,7 @@ e_source_goa_set_name (ESourceGoa *extension,
* with the #ESource to which @extension belongs. Can be %NULL or an empty
* string when not filled.
*
- * Returns: the associated GNOME Online Account's Address
+ * Returns: (nullable): the associated GNOME Online Account's Address
*
* Since: 3.24
**/
@@ -630,7 +630,7 @@ e_source_goa_get_address (ESourceGoa *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESourceGoa:address
+ * Returns: (nullable): a newly-allocated copy of #ESourceGoa:address
*
* Since: 3.24
**/
diff --git a/src/libedataserver/e-source-mail-account.c b/src/libedataserver/e-source-mail-account.c
index 9c9cac434..f45199839 100644
--- a/src/libedataserver/e-source-mail-account.c
+++ b/src/libedataserver/e-source-mail-account.c
@@ -263,7 +263,7 @@ e_source_mail_account_init (ESourceMailAccount *extension)
* Returns the #ESource:uid of the #ESource that describes the mail
* identity to be used for this account.
*
- * Returns: the mail identity #ESource:uid
+ * Returns: (nullable): the mail identity #ESource:uid
*
* Since: 3.6
**/
@@ -284,7 +284,7 @@ e_source_mail_account_get_identity_uid (ESourceMailAccount *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESourceMailAccount:identity-uid
+ * Returns: (nullable): a newly-allocated copy of #ESourceMailAccount:identity-uid
*
* Since: 3.6
**/
@@ -309,7 +309,7 @@ e_source_mail_account_dup_identity_uid (ESourceMailAccount *extension)
/**
* e_source_mail_account_set_identity_uid:
* @extension: an #ESourceMailAccount
- * @identity_uid: (allow-none): the mail identity #ESource:uid, or %NULL
+ * @identity_uid: (nullable): the mail identity #ESource:uid, or %NULL
*
* Sets the #ESource:uid of the #ESource that describes the mail
* identity to be used for this account.
@@ -344,7 +344,7 @@ e_source_mail_account_set_identity_uid (ESourceMailAccount *extension,
* Returns a string identifying the archive folder.
* The format of the identifier string is defined by the client application.
*
- * Returns: an identifier of the archive folder
+ * Returns: (nullable): an identifier of the archive folder
*
* Since: 3.16
**/
@@ -365,7 +365,7 @@ e_source_mail_account_get_archive_folder (ESourceMailAccount *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESourceMailAccount:archive-folder
+ * Returns: (nullable): a newly-allocated copy of #ESourceMailAccount:archive-folder
*
* Since: 3.16
**/
@@ -390,7 +390,7 @@ e_source_mail_account_dup_archive_folder (ESourceMailAccount *extension)
/**
* e_source_mail_account_set_archive_folder:
* @extension: an #ESourceMailAccount
- * @archive_folder: (allow-none): an identifier for the archive folder, or %NULL
+ * @archive_folder: (nullable): an identifier for the archive folder, or %NULL
*
* Sets the folder for sent messages by an identifier string.
* The format of the identifier string is defined by the client application.
diff --git a/src/libedataserver/e-source-mail-composition.c b/src/libedataserver/e-source-mail-composition.c
index 1fe90d7d8..ae295ed9b 100644
--- a/src/libedataserver/e-source-mail-composition.c
+++ b/src/libedataserver/e-source-mail-composition.c
@@ -561,7 +561,7 @@ e_source_mail_composition_set_cc (ESourceMailComposition *extension,
* Returns a string identifying the preferred folder for draft messages.
* The format of the identifier string is defined by the client application.
*
- * Returns: an identifier for the preferred drafts folder
+ * Returns: (nullable): an identifier for the preferred drafts folder
*
* Since: 3.6
**/
@@ -582,7 +582,7 @@ e_source_mail_composition_get_drafts_folder (ESourceMailComposition *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESourceMailComposition:drafts-folder
+ * Returns: (nullable): a newly-allocated copy of #ESourceMailComposition:drafts-folder
*
* Since: 3.6
**/
@@ -607,7 +607,7 @@ e_source_mail_composition_dup_drafts_folder (ESourceMailComposition *extension)
/**
* e_source_mail_composition_set_drafts_folder:
* @extension: an #ESourceMailComposition
- * @drafts_folder: (allow-none): an identifier for the preferred drafts
+ * @drafts_folder: (nullable): an identifier for the preferred drafts
* folder, or %NULL
*
* Sets the preferred folder for draft messages by an identifier string.
@@ -692,7 +692,7 @@ e_source_mail_composition_set_sign_imip (ESourceMailComposition *extension,
* Returns a string identifying the preferred folder for message templates.
* The format of the identifier string is defined by the client application.
*
- * Returns: an identifier for the preferred templates folder
+ * Returns: (nullable): an identifier for the preferred templates folder
*
* Since: 3.6
**/
@@ -713,7 +713,7 @@ e_source_mail_composition_get_templates_folder (ESourceMailComposition *extensio
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESourceMailComposition:templates-folder
+ * Returns: (nullable): a newly-allocated copy of #ESourceMailComposition:templates-folder
*
* Since: 3.6
**/
@@ -738,7 +738,7 @@ e_source_mail_composition_dup_templates_folder (ESourceMailComposition *extensio
/**
* e_source_mail_composition_set_templates_folder:
* @extension: an #ESourceMailComposition
- * @templates_folder: (allow-none): an identifier for the preferred templates
+ * @templates_folder: (nullable): an identifier for the preferred templates
* folder, or %NULL
*
* Sets the preferred folder for message templates by an identifier string.
@@ -932,7 +932,7 @@ e_source_mail_composition_get_language (ESourceMailComposition *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESourceMailComposition:language
+ * Returns: (nullable): a newly-allocated copy of #ESourceMailComposition:language
*
* Since: 3.32
**/
diff --git a/src/libedataserver/e-source-mail-identity.c b/src/libedataserver/e-source-mail-identity.c
index 87ec5693c..416e66fa9 100644
--- a/src/libedataserver/e-source-mail-identity.c
+++ b/src/libedataserver/e-source-mail-identity.c
@@ -297,7 +297,7 @@ e_source_mail_identity_init (ESourceMailIdentity *extension)
* Returns the email address for this identity from which to send messages.
* This may be an empty string but will never be %NULL.
*
- * Returns: the sender's email address
+ * Returns: (nullable): the sender's email address
*
* Since: 3.6
**/
@@ -318,7 +318,7 @@ e_source_mail_identity_get_address (ESourceMailIdentity *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESourceMailIdentity:address
+ * Returns: (nullable): a newly-allocated copy of #ESourceMailIdentity:address
*
* Since: 3.6
**/
@@ -343,7 +343,7 @@ e_source_mail_identity_dup_address (ESourceMailIdentity *extension)
/**
* e_source_mail_identity_set_address:
* @extension: an #ESourceMailIdentity
- * @address: (allow-none): the sender's email address, or %NULL
+ * @address: (nullable): the sender's email address, or %NULL
*
* Sets the email address for this identity from which to send messages.
*
@@ -380,7 +380,7 @@ e_source_mail_identity_set_address (ESourceMailIdentity *extension,
*
* Returns the sender's name for this identity.
*
- * Returns: the sender's name
+ * Returns: (nullable): the sender's name
*
* Since: 3.6
**/
@@ -401,7 +401,7 @@ e_source_mail_identity_get_name (ESourceMailIdentity *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESourceMailIdentity:name
+ * Returns: (nullable): a newly-allocated copy of #ESourceMailIdentity:name
*
* Since: 3.6
**/
@@ -426,7 +426,7 @@ e_source_mail_identity_dup_name (ESourceMailIdentity *extension)
/**
* e_source_mail_identity_set_name:
* @extension: an #ESourceMailIdentity
- * @name: (allow-none): the sender's name, or %NULL
+ * @name: (nullable): the sender's name, or %NULL
*
* Sets the sender's name for this identity.
*
@@ -462,7 +462,7 @@ e_source_mail_identity_set_name (ESourceMailIdentity *extension,
*
* Returns the sender's organization for this identity.
*
- * Returns: the sender's organization
+ * Returns: (nullable): the sender's organization
*
* Since: 3.6
**/
@@ -483,7 +483,7 @@ e_source_mail_identity_get_organization (ESourceMailIdentity *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESourceMailIdentity:organization
+ * Returns: (nullable): a newly-allocated copy of #ESourceMailIdentity:organization
*
* Since: 3.6
**/
@@ -508,7 +508,7 @@ e_source_mail_identity_dup_organization (ESourceMailIdentity *extension)
/**
* e_source_mail_identity_set_organization:
* @extension: an #ESourceMailIdentity
- * @organization: (allow-none): the sender's organization, or %NULL
+ * @organization: (nullable): the sender's organization, or %NULL
*
* Sets the sender's organization for this identity.
*
@@ -546,7 +546,7 @@ e_source_mail_identity_set_organization (ESourceMailIdentity *extension,
* Returns the email address for this identity to which recipients should
* send replies.
*
- * Returns: the sender's reply-to address
+ * Returns: (nullable): the sender's reply-to address
*
* Since: 3.6
**/
@@ -567,7 +567,7 @@ e_source_mail_identity_get_reply_to (ESourceMailIdentity *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESourceMailIdentity:reply-to
+ * Returns: (nullable): a newly-allocated copy of #ESourceMailIdentity:reply-to
*
* Since: 3.6
**/
@@ -592,7 +592,7 @@ e_source_mail_identity_dup_reply_to (ESourceMailIdentity *extension)
/**
* e_source_mail_identity_set_reply_to:
* @extension: an #ESourceMailIdentity
- * @reply_to: (allow-none): the sender's reply-to address, or %NULL
+ * @reply_to: (nullable): the sender's reply-to address, or %NULL
*
* Sets the email address for this identity to which recipients should
* send replies.
@@ -634,7 +634,7 @@ e_source_mail_identity_set_reply_to (ESourceMailIdentity *extension,
* convention is to set the #ESourceMailIdentity:signature-uid property
* to "none".
*
- * Returns: the sender's signature ID, or "none"
+ * Returns: (nullable): the sender's signature ID, or "none"
*
* Since: 3.6
**/
@@ -655,7 +655,7 @@ e_source_mail_identity_get_signature_uid (ESourceMailIdentity *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESourceMailIdentity:signature-uid
+ * Returns: (nullable): a newly-allocated copy of #ESourceMailIdentity:signature-uid
*
* Since: 3.6
**/
@@ -680,7 +680,7 @@ e_source_mail_identity_dup_signature_uid (ESourceMailIdentity *extension)
/**
* e_source_mail_identity_set_signature_uid:
* @extension: an #ESourceMailIdentity
- * @signature_uid: (allow-none): the sender's signature ID, or %NULL
+ * @signature_uid: (nullable): the sender's signature ID, or %NULL
*
* Sets the #ESource:uid of an #ESource describing a mail signature.
*
@@ -726,7 +726,7 @@ e_source_mail_identity_set_signature_uid (ESourceMailIdentity *extension,
* There can be used camel_address_decode() on a #CamelInternetAddress
* to decode the list of aliases.
*
- * Returns: (transfer none): the sender's email address aliases
+ * Returns: (nullable): the sender's email address aliases
*
* Since: 3.24
**/
@@ -747,7 +747,7 @@ e_source_mail_identity_get_aliases (ESourceMailIdentity *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: (transfer full): a newly-allocated copy of #ESourceMailIdentity:aliases
+ * Returns: (nullable): a newly-allocated copy of #ESourceMailIdentity:aliases
*
* Since: 3.24
**/
@@ -772,7 +772,7 @@ e_source_mail_identity_dup_aliases (ESourceMailIdentity *extension)
/**
* e_source_mail_identity_set_aliases:
* @extension: an #ESourceMailIdentity
- * @aliases: (allow-none): the sender's email address aliases, or %NULL
+ * @aliases: (nullable): the sender's email address aliases, or %NULL
*
* Sets the email address aliases for this identity. These are comma-separated
* email addresses which may or may not contain also different name.
diff --git a/src/libedataserver/e-source-mail-signature.c b/src/libedataserver/e-source-mail-signature.c
index f5818ec91..375c26432 100644
--- a/src/libedataserver/e-source-mail-signature.c
+++ b/src/libedataserver/e-source-mail-signature.c
@@ -304,7 +304,7 @@ e_source_mail_signature_dup_mime_type (ESourceMailSignature *extension)
/**
* e_source_mail_signature_set_mime_type:
* @extension: an #ESourceMailSignature
- * @mime_type: (allow-none): a MIME type, or %NULL
+ * @mime_type: (nullable): a MIME type, or %NULL
*
* Sets the MIME type of the signature content for @extension.
*
@@ -365,9 +365,9 @@ source_mail_signature_load_thread (GSimpleAsyncResult *simple,
* e_source_mail_signature_load_sync:
* @source: an #ESource
* @contents: (out): return location for the signature content
- * @length: (allow-none) (out): return location for the length of the signature
+ * @length: (optional) (out): return location for the length of the signature
* content, or %NULL if the length is not needed
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
* @error: return location for a #GError, or %NULL
*
* Loads a signature from the signature file for @source, which is
@@ -556,10 +556,9 @@ exit:
* e_source_mail_signature_load:
* @source: an #ESource
* @io_priority: the I/O priority of the request
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request
- * is satisfied
- * @user_data: (closure): data to pass to the callback function
+ * @cancellable: optional #GCancellable object, or %NULL
+ * @callback: a #GAsyncReadyCallback to call when the request is satisfied
+ * @user_data: data to pass to the callback function
*
* Asynchronously loads a signature from the signature file for @source,
* which is given by e_source_mail_signature_get_file().
@@ -609,7 +608,7 @@ e_source_mail_signature_load (ESource *source,
* @source: an #ESource
* @result: a #GAsyncResult
* @contents: (out): return location for the signature content
- * @length: (allow-none) (out): return location for the length of the signature
+ * @length: (optional) (out): return location for the length of the signature
* content, or %NULL if the length is not needed
* @error: return location for a #GError, or %NULL
*
@@ -682,7 +681,7 @@ source_mail_signature_replace_thread (GSimpleAsyncResult *simple,
* @source: an #ESource
* @contents: the signature contents
* @length: the length of @contents in bytes
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
* @error: return location for a #GError, or %NULL
*
* Replaces the signature file for @source with the given @contents
@@ -723,10 +722,9 @@ e_source_mail_signature_replace_sync (ESource *source,
* @contents: the signature contents
* @length: the length of @contents in bytes
* @io_priority: the I/O priority of the request
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request
- * is satisfied
- * @user_data: (closure): data to pass to the callback function
+ * @cancellable: optional #GCancellable object, or %NULL
+ * @callback: a #GAsyncReadyCallback to call when the request is satisfied
+ * @user_data: data to pass to the callback function
*
* Asynchrously replaces the signature file for @source with the given
* @contents of @length bytes. The signature file for @source is given
@@ -829,7 +827,7 @@ source_mail_signature_symlink_thread (GSimpleAsyncResult *simple,
* e_source_mail_signature_symlink_sync:
* @source: an #ESource
* @symlink_target: executable filename to link to
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
* @error: return location for a #GError, or %NULL
*
* Replaces the signature file for @source with a symbolic link to
@@ -873,10 +871,9 @@ e_source_mail_signature_symlink_sync (ESource *source,
* @source: an #ESource
* @symlink_target: executable filename to link to
* @io_priority: the I/O priority of the request
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request
- * is satisfied
- * @user_data: (closure): data to pass to the callback function
+ * @cancellable: optional #GCancellable object, or %NULL
+ * @callback: a #GAsyncReadyCallback to call when the request is satisfied
+ * @user_data: data to pass to the callback function
*
* Asynchronously replaces the signature file for @source with a symbolic
* link to @symlink_target, which should be an executable file that prints
diff --git a/src/libedataserver/e-source-mail-submission.c b/src/libedataserver/e-source-mail-submission.c
index b5d77f453..ba9aafd0d 100644
--- a/src/libedataserver/e-source-mail-submission.c
+++ b/src/libedataserver/e-source-mail-submission.c
@@ -232,7 +232,7 @@ e_source_mail_submission_init (ESourceMailSubmission *extension)
* Returns a string identifying the preferred folder for sent messages.
* The format of the identifier string is defined by the client application.
*
- * Returns: an identifier for the preferred sent folder
+ * Returns: (nullable): an identifier for the preferred sent folder
*
* Since: 3.6
**/
@@ -253,7 +253,7 @@ e_source_mail_submission_get_sent_folder (ESourceMailSubmission *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESourceMailSubmission:sent-folder
+ * Returns: (nullable): a newly-allocated copy of #ESourceMailSubmission:sent-folder
*
* Since: 3.6
**/
@@ -278,7 +278,7 @@ e_source_mail_submission_dup_sent_folder (ESourceMailSubmission *extension)
/**
* e_source_mail_submission_set_sent_folder:
* @extension: an #ESourceMailSubmission
- * @sent_folder: (allow-none): an identifier for the preferred sent folder,
+ * @sent_folder: (nullable): an identifier for the preferred sent folder,
* or %NULL
*
* Sets the preferred folder for sent messages by an identifier string.
@@ -357,7 +357,7 @@ e_source_mail_submission_set_use_sent_folder (ESourceMailSubmission *extension,
* Returns the #ESource:uid of the #ESource that describes the mail
* transport to be used for outgoing messages.
*
- * Returns: the mail transport #ESource:uid
+ * Returns: (nullable): the mail transport #ESource:uid
*
* Since: 3.6
**/
@@ -378,7 +378,7 @@ e_source_mail_submission_get_transport_uid (ESourceMailSubmission *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESourceMailSubmission:transport-uid
+ * Returns: (nullable): a newly-allocated copy of #ESourceMailSubmission:transport-uid
*
* Since: 3.6
**/
@@ -403,7 +403,7 @@ e_source_mail_submission_dup_transport_uid (ESourceMailSubmission *extension)
/**
* e_source_mail_submission_set_transport_uid:
* @extension: an #ESourceMailSubmission
- * @transport_uid: (allow-none): the mail transport #ESource:uid, or %NULL
+ * @transport_uid: (nullable): the mail transport #ESource:uid, or %NULL
*
* Sets the #ESource:uid of the #ESource that describes the mail
* transport to be used for outgoing messages.
diff --git a/src/libedataserver/e-source-proxy.c b/src/libedataserver/e-source-proxy.c
index dad8826ee..84d5ccd5a 100644
--- a/src/libedataserver/e-source-proxy.c
+++ b/src/libedataserver/e-source-proxy.c
@@ -1594,7 +1594,7 @@ e_source_proxy_set_socks_port (ESourceProxy *extension,
* e_source_proxy_lookup_sync:
* @source: an #ESource
* @uri: a URI representing the destination to connect to
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
* @error: return location for a #GError, or %NULL
*
* Looks into @source's #ESourceProxy extension to determine what proxy,
@@ -1784,10 +1784,9 @@ source_proxy_lookup_thread (GSimpleAsyncResult *simple,
* e_source_proxy_lookup:
* @source: an #ESource
* @uri: a URI representing the destination to connect to
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request
- * is satisfied
- * @user_data: (closure): data to pass to the callback function
+ * @cancellable: optional #GCancellable object, or %NULL
+ * @callback: a #GAsyncReadyCallback to call when the request is satisfied
+ * @user_data: data to pass to the callback function
*
* Asynchronously determines what proxy, if any, to use to connect to @uri.
* See e_source_proxy_lookup_sync() for more details.
diff --git a/src/libedataserver/e-source-refresh.c b/src/libedataserver/e-source-refresh.c
index 828e2354e..c401709db 100644
--- a/src/libedataserver/e-source-refresh.c
+++ b/src/libedataserver/e-source-refresh.c
@@ -479,11 +479,11 @@ e_source_refresh_set_interval_minutes (ESourceRefresh *extension,
/**
* e_source_refresh_add_timeout:
* @source: an #ESource
- * @context: (allow-none): a #GMainContext, or %NULL (if %NULL, the default
+ * @context: (nullable): a #GMainContext, or %NULL (if %NULL, the default
* context will be used)
* @callback: function to call on each timeout
* @user_data: data to pass to @callback
- * @notify: (allow-none): function to call when the timeout is removed,
+ * @notify: (nullable): function to call when the timeout is removed,
* or %NULL
*
* This is a simple way to schedule a periodic data source refresh.
diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c
index 3d61eb802..44a5b4b4c 100644
--- a/src/libedataserver/e-source-registry.c
+++ b/src/libedataserver/e-source-registry.c
@@ -1782,7 +1782,7 @@ e_source_registry_init (ESourceRegistry *registry)
/**
* e_source_registry_new_sync:
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
* @error: return location for a #GError, or %NULL
*
* Creates a new #ESourceRegistry front-end for the registry D-Bus service.
@@ -1842,10 +1842,9 @@ source_registry_init_cb (GObject *source_object,
/**
* e_source_registry_new:
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request
- * is satisfied
- * @user_data: (closure): data to pass to the callback function
+ * @cancellable: optional #GCancellable object, or %NULL
+ * @callback: a #GAsyncReadyCallback to call when the request is satisfied
+ * @user_data: data to pass to the callback function
*
* Asynchronously creates a new #ESourceRegistry front-end for the registry
* D-Bus service.
@@ -1940,7 +1939,7 @@ source_registry_commit_source_thread (GSimpleAsyncResult *simple,
* e_source_registry_commit_source_sync:
* @registry: an #ESourceRegistry
* @source: an #ESource with changes to commit
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
* @error: return location for #GError, or %NULL
*
* This is a convenience function intended for use with graphical
@@ -2010,10 +2009,9 @@ e_source_registry_commit_source_sync (ESourceRegistry *registry,
* e_source_registry_commit_source:
* @registry: an #ESourceRegistry
* @source: an #ESource with changes to commit
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request
- * is satisfied
- * @user_data: (closure): data to pass to the callback function
+ * @cancellable: optional #GCancellable object, or %NULL
+ * @callback: a #GAsyncReadyCallback to call when the request is satisfied
+ * @user_data: data to pass to the callback function
*
* See e_source_registry_commit_source_sync() for details.
*
@@ -2154,7 +2152,7 @@ source_registry_create_sources_object_added_cb (GDBusObjectManager *object_manag
* @registry: an #ESourceRegistry
* @list_of_sources: (element-type ESource): a list of #ESource instances with
* no #GDBusObject
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
* @error: return location for a #GError, or %NULL
*
* Requests the D-Bus service create new key files for each #ESource in
@@ -2263,10 +2261,9 @@ e_source_registry_create_sources_sync (ESourceRegistry *registry,
* @registry: an #ESourceRegistry
* @list_of_sources: (element-type ESource): a list of #ESource instances with
* no #GDBusObject
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request
- * is satisfied
- * @user_data: (closure): data to pass to the callback function
+ * @cancellable:optional #GCancellable object, or %NULL
+ * @callback: a #GAsyncReadyCallback to call when the request is satisfied
+ * @user_data: data to pass to the callback function
*
* Asynchronously requests the D-Bus service create new key files for each
* #ESource in @list_of_sources. Each list element must be a scratch
@@ -2404,9 +2401,8 @@ e_source_registry_refresh_backend_thread (GTask *task,
* @registry: an #ESourceRegistry
* @source_uid: UID of a collection #ESource whose backend to refresh
* @cancellable: optional #GCancellable object, or %NULL
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request
- * is satisfied
- * @user_data: (closure): data to pass to the callback function
+ * @callback: a #GAsyncReadyCallback to call when the request is satisfied
+ * @user_data: data to pass to the callback function
*
* Asynchronously requests the D-Bus service to refresh collection backend
* for an #ESource with UID @source_uid. The result means that the refresh
@@ -2476,7 +2472,7 @@ e_source_registry_refresh_backend_finish (ESourceRegistry *registry,
* The returned #ESource is referenced for thread-safety and must be
* unreferenced with g_object_unref() when finished with it.
*
- * Returns: (transfer full): an #ESource, or %NULL if no match was found
+ * Returns: (transfer full) (nullable): an #ESource, or %NULL if no match was found
*
* Since: 3.6
**/
@@ -2493,7 +2489,7 @@ e_source_registry_ref_source (ESourceRegistry *registry,
/**
* e_source_registry_list_sources:
* @registry: an #ESourceRegistry
- * @extension_name: (allow-none): an extension name, or %NULL
+ * @extension_name: (nullable): an extension name, or %NULL
*
* Returns a list of registered sources, sorted by display name. If
* @extension_name is given, restrict the list to sources having that
@@ -2548,7 +2544,7 @@ e_source_registry_list_sources (ESourceRegistry *registry,
/**
* e_source_registry_list_enabled:
* @registry: an #ESourceRegistry
- * @extension_name: (allow-none): an extension name, or %NULL
+ * @extension_name: (nullable): an extension name, or %NULL
*
* Similar to e_source_registry_list_sources(), but returns only enabled
* sources according to e_source_registry_check_enabled().
@@ -2620,7 +2616,7 @@ e_source_registry_list_enabled (ESourceRegistry *registry,
* instead of the #ESourceExtension itself because extension instances are
* not to be referenced directly (see e_source_get_extension()).
*
- * Returns: (transfer full): an #ESource, or %NULL if no match was found
+ * Returns: (transfer full) (nullable): an #ESource, or %NULL if no match was found
*
* Since: 3.6
**/
@@ -2766,7 +2762,7 @@ source_registry_prune_nodes (GNode *node,
/**
* e_source_registry_build_display_tree: (skip)
* @registry: an #ESourceRegistry
- * @extension_name: (allow-none): an extension name, or %NULL
+ * @extension_name: (nullable): an extension name, or %NULL
*
* Returns a single #GNode tree of registered sources that can be used to
* populate a #GtkTreeModel. (The root #GNode is just an empty placeholder.)
@@ -2850,7 +2846,7 @@ e_source_registry_free_display_tree (GNode *display_tree)
* e_source_registry_dup_unique_display_name:
* @registry: an #ESourceRegistry
* @source: an #ESource
- * @extension_name: (allow-none): an extension name, or %NULL
+ * @extension_name: (nullable): an extension name, or %NULL
*
* Compares @source's #ESource:display-name against other sources having
* an #ESourceExtension named @extension_name, if given, or else against
@@ -2985,7 +2981,7 @@ source_registry_debug_dump_cb (GNode *node)
/**
* e_source_registry_debug_dump:
* @registry: an #ESourceRegistry
- * @extension_name: (allow-none): an extension name, or %NULL
+ * @extension_name: (nullable): an extension name, or %NULL
*
* Handy debugging function that uses e_source_registry_build_display_tree()
* to print a tree of registered sources to standard output.
@@ -3230,7 +3226,7 @@ e_source_registry_ref_default_address_book (ESourceRegistry *registry)
/**
* e_source_registry_set_default_address_book:
* @registry: an #ESourceRegistry
- * @default_source: (allow-none): an address book #ESource, or %NULL
+ * @default_source: (nullable): an address book #ESource, or %NULL
*
* Sets @default_source as the default address book. If @default_source
* is %NULL, the default address book is reset to the built-in address book.
@@ -3302,7 +3298,7 @@ e_source_registry_ref_default_calendar (ESourceRegistry *registry)
/**
* e_source_registry_set_default_calendar:
* @registry: an #ESourceRegistry
- * @default_source: (allow-none): a calendar #ESource, or %NULL
+ * @default_source: (nullable): a calendar #ESource, or %NULL
*
* Sets @default_source as the default calendar. If @default_source
* is %NULL, the default calendar is reset to the built-in calendar.
@@ -3374,7 +3370,7 @@ e_source_registry_ref_default_mail_account (ESourceRegistry *registry)
/**
* e_source_registry_set_default_mail_account:
* @registry: an #ESourceRegistry
- * @default_source: (allow-none): a mail account #ESource, or %NULL
+ * @default_source: (nullable): a mail account #ESource, or %NULL
*
* Sets @default_source as the default mail account. If @default_source
* is %NULL, the default mail account is reset to the built-in mail account.
@@ -3502,7 +3498,7 @@ e_source_registry_ref_default_mail_identity (ESourceRegistry *registry)
/**
* e_source_registry_set_default_mail_identity:
* @registry: an #ESourceRegistry
- * @default_source: (allow-none): a mail identity #ESource, or %NULL
+ * @default_source: (nullable): a mail identity #ESource, or %NULL
*
* Sets @default_source as the default mail identity. If @default_source
* is %NULL, the next request for the default mail identity will use the
@@ -3574,7 +3570,7 @@ e_source_registry_ref_default_memo_list (ESourceRegistry *registry)
/**
* e_source_registry_set_default_memo_list:
* @registry: an #ESourceRegistry
- * @default_source: (allow-none): a memo list #ESource, or %NULL
+ * @default_source: (nullable): a memo list #ESource, or %NULL
*
* Sets @default_source as the default memo list. If @default_source
* is %NULL, the default memo list is reset to the built-in memo list.
@@ -3646,7 +3642,7 @@ e_source_registry_ref_default_task_list (ESourceRegistry *registry)
/**
* e_source_registry_set_default_task_list:
* @registry: an #ESourceRegistry
- * @default_source: (allow-none): a task list #ESource, or %NULL
+ * @default_source: (nullable): a task list #ESource, or %NULL
*
* Sets @default_source as the default task list. If @default_source
* is %NULL, the default task list is reset to the built-in task list.
@@ -3711,7 +3707,7 @@ e_source_registry_set_default_task_list (ESourceRegistry *registry,
* The returned #ESource is referenced for thread-safety and must be
* unreferenced with g_object_unref() when finished with it.
*
- * Returns: (transfer full): the default #ESource based on @extension_name
+ * Returns: (transfer full) (nullable): the default #ESource based on @extension_name
*
* Since: 3.6
**/
@@ -3747,7 +3743,7 @@ e_source_registry_ref_default_for_extension_name (ESourceRegistry *registry,
* e_source_registry_set_default_for_extension_name:
* @registry: an #ESourceRegistry
* @extension_name: an extension name
- * @default_source: (allow-none): an #ESource, or %NULL
+ * @default_source: (nullable): an #ESource, or %NULL
*
* This is a convenience function to set a default #ESource based on
* @extension_name. This only works with a subset of extension names.
diff --git a/src/libedataserver/e-source-resource.c b/src/libedataserver/e-source-resource.c
index f632ff01b..d363a766a 100644
--- a/src/libedataserver/e-source-resource.c
+++ b/src/libedataserver/e-source-resource.c
@@ -148,7 +148,7 @@ e_source_resource_init (ESourceResource *extension)
* Returns the server-assigned identity of the remote resource associated
* with the #ESource to which @extension belongs.
*
- * Returns: the identity of a remote resource
+ * Returns: (nullable): the identity of a remote resource
*
* Since: 3.6
**/
@@ -169,7 +169,7 @@ e_source_resource_get_identity (ESourceResource *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESourceResource:identity
+ * Returns: (nullable): a newly-allocated copy of #ESourceResource:identity
*
* Since: 3.6
**/
@@ -194,7 +194,7 @@ e_source_resource_dup_identity (ESourceResource *extension)
/**
* e_source_resource_set_identity:
* @extension: an #ESourceResource
- * @identity: (allow-none): the identity of a remote resource
+ * @identity: (nullable): the identity of a remote resource
*
* Sets the server-assigned identity of the remote resource associated with
* the #ESource to which @extension belongs.
diff --git a/src/libedataserver/e-source-security.c b/src/libedataserver/e-source-security.c
index e3ca75a9a..1b8b8d9e3 100644
--- a/src/libedataserver/e-source-security.c
+++ b/src/libedataserver/e-source-security.c
@@ -218,7 +218,7 @@ e_source_security_dup_method (ESourceSecurity *extension)
/**
* e_source_security_set_method:
* @extension: an #ESourceSecurity
- * @method: (allow-none): security method, or %NULL
+ * @method: (nullable): security method, or %NULL
*
* Sets the method used to establish a secure network connection to a
* remote account. There are no pre-defined method names; backends are
diff --git a/src/libedataserver/e-source-smime.c b/src/libedataserver/e-source-smime.c
index 4ce4fea9d..dbbae928e 100644
--- a/src/libedataserver/e-source-smime.c
+++ b/src/libedataserver/e-source-smime.c
@@ -289,7 +289,7 @@ e_source_smime_init (ESourceSMIME *extension)
*
* Returns the S/MIME certificate name used to encrypt messages.
*
- * Returns: the certificate name used to encrypt messages
+ * Returns: (nullable): the certificate name used to encrypt messages
*
* Since: 3.6
**/
@@ -310,7 +310,7 @@ e_source_smime_get_encryption_certificate (ESourceSMIME *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESourceSMIME:encryption-certificate
+ * Returns: (nullable): a newly-allocated copy of #ESourceSMIME:encryption-certificate
*
* Since: 3.6
**/
@@ -335,7 +335,7 @@ e_source_smime_dup_encryption_certificate (ESourceSMIME *extension)
/**
* e_source_smime_set_encryption_certificate:
* @extension: an #ESourceSMIME
- * @encryption_certificate: (allow-none): the certificate name used to encrypt
+ * @encryption_certificate: (nullable): the certificate name used to encrypt
* messages, or %NULL
*
* Sets the certificate name used to encrypt messages.
@@ -461,7 +461,7 @@ e_source_smime_set_encrypt_to_self (ESourceSMIME *extension,
* Returns the name of the hash algorithm used to digitally sign outgoing
* messages.
*
- * Returns: the signing algorithm for outgoing messages
+ * Returns: (nullable): the signing algorithm for outgoing messages
*
* Since: 3.6
**/
@@ -482,7 +482,7 @@ e_source_smime_get_signing_algorithm (ESourceSMIME *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESourceSMIME:signing-algorithm
+ * Returns: (nullable): a newly-allocated copy of #ESourceSMIME:signing-algorithm
*
* Since: 3.6
**/
@@ -507,7 +507,7 @@ e_source_smime_dup_signing_algorithm (ESourceSMIME *extension)
/**
* e_source_smime_set_signing_algorithm:
* @extension: an #ESourceSMIME
- * @signing_algorithm: (allow-none): the signing algorithm for outgoing
+ * @signing_algorithm: (nullable): the signing algorithm for outgoing
* messages, or %NULL
*
* Sets the name of the hash algorithm used to digitally sign outgoing
@@ -547,7 +547,7 @@ e_source_smime_set_signing_algorithm (ESourceSMIME *extension,
*
* Returns the S/MIME certificate name used to sign messages.
*
- * Returns: the certificate name used to sign messages
+ * Returns: (nullable): the certificate name used to sign messages
*
* Since: 3.6
**/
@@ -568,7 +568,7 @@ e_source_smime_get_signing_certificate (ESourceSMIME *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESourceSMIME:signing-certificate
+ * Returns: (nullable): a newly-allocated copy of #ESourceSMIME:signing-certificate
*
* Since: 3.6
**/
@@ -593,7 +593,7 @@ e_source_smime_dup_signing_certificate (ESourceSMIME *extension)
/**
* e_source_smime_set_signing_certificate:
* @extension: an #ESourceSMIME
- * @signing_certificate: (allow-none): the certificate name used to sign
+ * @signing_certificate: (nullable): the certificate name used to sign
* messages, or %NULL
*
* Sets the S/MIME certificate name used to sign messages.
diff --git a/src/libedataserver/e-source-webdav.c b/src/libedataserver/e-source-webdav.c
index c4762895e..09b9cd09a 100644
--- a/src/libedataserver/e-source-webdav.c
+++ b/src/libedataserver/e-source-webdav.c
@@ -772,7 +772,7 @@ e_source_webdav_set_calendar_auto_schedule (ESourceWebdav *extension,
* differ from the #ESource:display-name property of the #ESource to which
* @extension belongs.
*
- * Returns: the display name of the WebDAV resource
+ * Returns: (nullable): the display name of the WebDAV resource
*
* Since: 3.6
**/
@@ -793,7 +793,7 @@ e_source_webdav_get_display_name (ESourceWebdav *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESourceWebdav:display-name
+ * Returns: (nullable): a newly-allocated copy of #ESourceWebdav:display-name
*
* Since: 3.6
**/
@@ -818,7 +818,7 @@ e_source_webdav_dup_display_name (ESourceWebdav *extension)
/**
* e_source_webdav_set_display_name:
* @extension: an #ESourceWebdav
- * @display_name: (allow-none): the display name of the WebDAV resource,
+ * @display_name: (nullable): the display name of the WebDAV resource,
* or %NULL
*
* Updates the last known display name of a WebDAV resource, which may
@@ -858,7 +858,7 @@ e_source_webdav_set_display_name (ESourceWebdav *extension,
*
* Returns the last known color of a WebDAV resource as provided by the server.
*
- * Returns: the color of the WebDAV resource, if any set on the server
+ * Returns: (nullable): the color of the WebDAV resource, if any set on the server
*
* Since: 3.30
**/
@@ -879,7 +879,7 @@ e_source_webdav_get_color (ESourceWebdav *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESourceWebdav:color
+ * Returns: (nullable): a newly-allocated copy of #ESourceWebdav:color
*
* Since: 3.30
**/
@@ -942,7 +942,7 @@ e_source_webdav_set_color (ESourceWebdav *extension,
* Returns the user's email address which can be passed to a CalDAV server
* if the user wishes to receive scheduling messages.
*
- * Returns: the user's email address
+ * Returns: (nullable): the user's email address
*
* Since: 3.6
**/
@@ -963,7 +963,7 @@ e_source_webdav_get_email_address (ESourceWebdav *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: the newly-allocated copy of #ESourceWebdav:email-address
+ * Returns: (nullable): the newly-allocated copy of #ESourceWebdav:email-address
*
* Since: 3.6
**/
@@ -988,7 +988,7 @@ e_source_webdav_dup_email_address (ESourceWebdav *extension)
/**
* e_source_webdav_set_email_address:
* @extension: an #ESourceWebdav
- * @email_address: (allow-none): the user's email address, or %NULL
+ * @email_address: (nullable): the user's email address, or %NULL
*
* Sets the user's email address which can be passed to a CalDAV server if
* the user wishes to receive scheduling messages.
@@ -1026,7 +1026,7 @@ e_source_webdav_set_email_address (ESourceWebdav *extension,
*
* Returns the absolute path to a resource on a WebDAV server.
*
- * Returns: the absolute path to a WebDAV resource
+ * Returns: (nullable): the absolute path to a WebDAV resource
*
* Since: 3.6
**/
@@ -1047,7 +1047,7 @@ e_source_webdav_get_resource_path (ESourceWebdav *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: the newly-allocated copy of #ESourceWebdav:resource-path
+ * Returns: (nullable): the newly-allocated copy of #ESourceWebdav:resource-path
*
* Since: 3.6
**/
@@ -1072,7 +1072,7 @@ e_source_webdav_dup_resource_path (ESourceWebdav *extension)
/**
* e_source_webdav_set_resource_path:
* @extension: an #ESourceWebdav
- * @resource_path: (allow-none): the absolute path to a WebDAV resource,
+ * @resource_path: (nullable): the absolute path to a WebDAV resource,
* or %NULL
*
* Sets the absolute path to a resource on a WebDAV server.
@@ -1115,7 +1115,7 @@ e_source_webdav_set_resource_path (ESourceWebdav *extension,
* content on-the-fly. The #ESourceWebdav:resource-query holds the input
* values for the program.
*
- * Returns: the query to access a WebDAV resource
+ * Returns: (nullable): the query to access a WebDAV resource
*
* Since: 3.6
**/
@@ -1136,7 +1136,7 @@ e_source_webdav_get_resource_query (ESourceWebdav *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: the newly-allocated copy of #ESourceWebdav:resource-query
+ * Returns: (nullable): the newly-allocated copy of #ESourceWebdav:resource-query
*
* Since: 3.6
**/
@@ -1161,7 +1161,7 @@ e_source_webdav_dup_resource_query (ESourceWebdav *extension)
/**
* e_source_webdav_set_resource_query:
* @extension: an #ESourceWebdav
- * @resource_query: (allow-none): the query to access a WebDAV resource,
+ * @resource_query: (nullable): the query to access a WebDAV resource,
* or %NULL
*
* Sets the URI query required to access a resource on a WebDAV server.
@@ -1211,7 +1211,7 @@ e_source_webdav_set_resource_query (ESourceWebdav *extension,
* it is supposed to be manipulated with e_source_webdav_update_ssl_trust()
* and e_source_webdav_verify_ssl_trust().
*
- * Returns: an SSL/TLS certificate trust for the @extension
+ * Returns: (nullable): an SSL/TLS certificate trust for the @extension
*
* Since: 3.8
**/
@@ -1232,7 +1232,7 @@ e_source_webdav_get_ssl_trust (ESourceWebdav *extension)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: the newly-allocated copy of #ESourceWebdav:ssl-trust
+ * Returns: (nullable): the newly-allocated copy of #ESourceWebdav:ssl-trust
*
* Since: 3.8
**/
@@ -1257,7 +1257,7 @@ e_source_webdav_dup_ssl_trust (ESourceWebdav *extension)
/**
* e_source_webdav_set_ssl_trust:
* @extension: an #ESourceWebdav
- * @ssl_trust: (allow-none): the ssl_trust to store, or %NULL to unset
+ * @ssl_trust: (nullable): the ssl_trust to store, or %NULL to unset
*
* Sets the SSL/TLS certificate trust. See e_source_webdav_get_ssl_trust()
* for more infomation about its content and how to use it.
diff --git a/src/libedataserver/e-source.c b/src/libedataserver/e-source.c
index f87e54bab..6c76cd22f 100644
--- a/src/libedataserver/e-source.c
+++ b/src/libedataserver/e-source.c
@@ -2520,8 +2520,8 @@ __e_source_private_replace_dbus_object (ESource *source,
/**
* e_source_new:
- * @dbus_object: (allow-none): a #GDBusObject or %NULL
- * @main_context: (allow-none): a #GMainContext or %NULL
+ * @dbus_object: (nullable): a #GDBusObject or %NULL
+ * @main_context: (nullable): a #GMainContext or %NULL
* @error: return location for a #GError, or %NULL
*
* Creates a new #ESource instance.
@@ -2558,7 +2558,7 @@ e_source_new (GDBusObject *dbus_object,
/**
* e_source_new_with_uid:
* @uid: a new unique identifier string
- * @main_context: (allow-none): a #GMainContext or %NULL
+ * @main_context: (nullable): a #GMainContext or %NULL
* @error: return location for a #GError, or %NULL
*
* Creates a new "scratch" #ESource with a predetermined unique identifier.
@@ -2729,7 +2729,7 @@ e_source_dup_uid (ESource *source)
*
* Returns the unique identifier string of the parent #ESource.
*
- * Returns: the UID of the parent #ESource
+ * Returns: (nullable): the UID of the parent #ESource
*
* Since: 3.6
**/
@@ -2750,7 +2750,7 @@ e_source_get_parent (ESource *source)
*
* The returned string should be freed with g_free() when no longer needed.
*
- * Returns: a newly-allocated copy of #ESource:parent
+ * Returns: (nullable): a newly-allocated copy of #ESource:parent
*
* Since: 3.6
**/
@@ -2775,7 +2775,7 @@ e_source_dup_parent (ESource *source)
/**
* e_source_set_parent:
* @source: an #ESource
- * @parent: (allow-none): the UID of the parent #ESource, or %NULL
+ * @parent: (nullable): the UID of the parent #ESource, or %NULL
*
* Identifies the parent of @source by its unique identifier string.
* This can only be set prior to adding @source to an #ESourceRegistry.
@@ -3146,7 +3146,7 @@ e_source_has_extension (ESource *source,
* The returned #GDBusObject is referenced for thread-safety and must be
* unreferenced with g_object_unref() when finished with it.
*
- * Returns: (transfer full): the #GDBusObject for @source, or %NULL
+ * Returns: (transfer full) (nullable): the #GDBusObject for @source, or %NULL
*
* Since: 3.6
**/
@@ -3435,7 +3435,7 @@ e_source_compare_by_display_name (ESource *source1,
/**
* e_source_to_string:
* @source: an #ESource
- * @length: (allow-none): return location for the length of the returned
+ * @length: (optional) (out): return location for the length of the returned
* string, or %NULL
*
* Outputs the current contents of @source as a key file string.
@@ -3581,7 +3581,7 @@ e_source_set_connection_status (ESource *source,
/**
* e_source_remove_sync:
* @source: the #ESource to be removed
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
* @error: return location for a #GError, or %NULL
*
* Requests the D-Bus service to delete the key files for @source and all of
@@ -3613,10 +3613,9 @@ e_source_remove_sync (ESource *source,
/**
* e_source_remove:
* @source: the #ESource to be removed
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request
- * is satisfied
- * @user_data: (closure): data to pass to the callback function
+ * @cancellable: optional #GCancellable object, or %NULL
+ * @callback: a #GAsyncReadyCallback to call when the request is satisfied
+ * @user_data: data to pass to the callback function
*
* Asynchronously requests the D-Bus service to delete the key files for
* @source and all of its descendants and broadcast their removal to all
@@ -3677,7 +3676,7 @@ e_source_remove_finish (ESource *source,
/**
* e_source_write_sync:
* @source: a writable #ESource
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
* @error: return location for a #GError, or %NULL
*
* Submits the current contents of @source to the D-Bus service to be
@@ -3709,10 +3708,9 @@ e_source_write_sync (ESource *source,
/**
* e_source_write:
* @source: a writable #ESource
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request
- * is satisfied
- * @user_data: (closure): data to pass to the callback function
+ * @cancellable: optional #GCancellable object, or %NULL
+ * @callback: a #GAsyncReadyCallback to call when the request is satisfied
+ * @user_data: data to pass to the callback function
*
* Asynchronously submits the current contents of @source to the D-Bus
* service to be written to disk and broadcast to other clients. The
@@ -3774,7 +3772,7 @@ e_source_write_finish (ESource *source,
* e_source_remote_create_sync:
* @source: an #ESource
* @scratch_source: an #ESource describing the resource to create
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
* @error: return location for a #GError, or %NULL
*
* Creates a new remote resource by picking out relevant details from
@@ -3815,10 +3813,9 @@ e_source_remote_create_sync (ESource *source,
* e_source_remote_create:
* @source: an #ESource
* @scratch_source: an #ESource describing the resource to create
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request
- * is satisfied
- * @user_data: (closure): data to pass to the callback function
+ * @cancellable: optional #GCancellable object, or %NULL
+ * @callback: a #GAsyncReadyCallback to call when the request is satisfied
+ * @user_data: data to pass to the callback function
*
* Asynchronously creates a new remote resource by picking out relevant
* details from @scratch_source. The @scratch_source must be an #ESource
@@ -3887,7 +3884,7 @@ e_source_remote_create_finish (ESource *source,
/**
* e_source_remote_delete_sync:
* @source: an #ESource
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
* @error: return location for a #GError, or %NULL
*
* Deletes the resource represented by @source from a remote server.
@@ -3920,10 +3917,9 @@ e_source_remote_delete_sync (ESource *source,
/**
* e_source_remote_delete:
* @source: an #ESource
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request
- * is satisfied
- * @user_data: (closure): data to pass to the callback function
+ * @cancellable: optional #GCancellable object, or %NULL
+ * @callback: a #GAsyncReadyCallback to call when the request is satisfied
+ * @user_data: data to pass to the callback function
*
* Asynchronously deletes the resource represented by @source from a remote
* server. The @source must be #ESource:remote-deletable. This will also
@@ -3984,10 +3980,10 @@ e_source_remote_delete_finish (ESource *source,
/**
* e_source_get_oauth2_access_token_sync:
* @source: an #ESource
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
- * @out_access_token: (allow-none) (out): return location for the access token,
+ * @cancellable: optional #GCancellable object, or %NULL
+ * @out_access_token: (optional) (out): return location for the access token,
* or %NULL
- * @out_expires_in: (allow-none) (out): return location for the token expiry,
+ * @out_expires_in: (optional) (out): return location for the token expiry,
* or %NULL
* @error: return location for a #GError, or %NULL
*
@@ -4023,10 +4019,10 @@ e_source_get_oauth2_access_token_sync (ESource *source,
/**
* e_source_get_oauth2_access_token:
* @source: an #ESource
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request
+ * @cancellable: optional #GCancellable object, or %NULL
+ * @callback: a #GAsyncReadyCallback to call when the request
* is satisfied
- * @user_data: (closure): data to pass to the callback function
+ * @user_data: data to pass to the callback function
*
* Asynchronously obtains the OAuth 2.0 access token for @source along
* with its expiry in seconds from the current time (or 0 if unknown).
@@ -4059,9 +4055,9 @@ e_source_get_oauth2_access_token (ESource *source,
* e_source_get_oauth2_access_token_finish:
* @source: an #ESource
* @result: a #GAsyncResult
- * @out_access_token: (allow-none) (out): return location for the access token,
+ * @out_access_token: (optional) (out): return location for the access token,
* or %NULL
- * @out_expires_in: (allow-none) (out): return location for the token expiry,
+ * @out_expires_in: (optional) (out): return location for the token expiry,
* or %NULL
* @error: return location for a #GError, or %NULL
*
@@ -4247,7 +4243,7 @@ e_source_store_password_finish (ESource *source,
* e_source_lookup_password_sync:
* @source: an #ESource
* @cancellable: optional #GCancellable object, or %NULL
- * @out_password: (out): return location for the password, or %NULL
+ * @out_password: (out) (optional) (nullable): return location for the password, or %NULL
* @error: return location for a #GError, or %NULL
*
* Looks up a password for @source. Both the default and session keyrings
@@ -4351,7 +4347,7 @@ e_source_lookup_password (ESource *source,
* e_source_lookup_password_finish:
* @source: an #ESource
* @result: a #GAsyncResult
- * @out_password: (out): return location for the password, or %NULL
+ * @out_password: (out) (optional) (nullable): return location for the password, or %NULL
* @error: return location for a #GError, or %NULL
*
* Finishes the operation started with e_source_lookup_password().
@@ -4519,9 +4515,9 @@ e_source_delete_password_finish (ESource *source,
* @reason: an #ESourceCredentialsReason, why the credentials are required
* @certificate_pem: PEM-encoded secure connection certificate, or an empty string
* @certificate_errors: a bit-or of #GTlsCertificateFlags for secure connection certificate
- * @op_error: (allow-none): a #GError with a description of the previous credentials error, or %NULL
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
- * @error: (allow-none): return location for a #GError, or %NULL
+ * @op_error: (nullable): a #GError with a description of the previous credentials error, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
+ * @error: return location for a #GError, or %NULL
*
* Let's the client-side know that credentials are required. The @reason defines which
* parameters are used. The client passed the credentials with an e_source_invoke_authenticate()
@@ -4684,8 +4680,8 @@ source_invoke_credentials_required_thread (GTask *task,
* @reason: an #ESourceCredentialsReason, why the credentials are required
* @certificate_pem: PEM-encoded secure connection certificate, or an empty string
* @certificate_errors: a bit-or of #GTlsCertificateFlags for secure connection certificate
- * @op_error: (allow-none): a #GError with a description of the previous credentials error, or %NULL
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @op_error: (nullable): a #GError with a description of the previous credentials error, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
* @callback: a #GAsyncReadyCallback to call when the request is satisfied
* @user_data: data to pass to the callback function
*
@@ -4731,7 +4727,7 @@ e_source_invoke_credentials_required (ESource *source,
* e_source_invoke_credentials_required_finish:
* @source: an #ESource
* @result: a #GAsyncResult
- * @error: (allow-none): return location for a #GError, or %NULL
+ * @error: return location for a #GError, or %NULL
*
* Finishes the operation started with e_source_invoke_credentials_required().
*
@@ -4759,10 +4755,10 @@ e_source_invoke_credentials_required_finish (ESource *source,
/**
* e_source_invoke_authenticate_sync:
* @source: an #ESource
- * @credentials: (allow-none): an #ENamedParameters structure with credentials to use; can be %NULL
+ * @credentials: (nullable): an #ENamedParameters structure with credentials to use; can be %NULL
* to use those from the last call
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
- * @error: (allow-none): return location for a #GError, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
+ * @error: return location for a #GError, or %NULL
*
* Calls the InvokeAuthenticate method on the server side, thus the backend
* knows what credentials to use to connect to its (possibly remote) data store.
@@ -4866,9 +4862,9 @@ source_invoke_authenticate_thread (GTask *task,
/**
* e_source_invoke_authenticate:
* @source: an #ESource
- * @credentials: (allow-none): an #ENamedParameters structure with credentials to use; can be %NULL
+ * @credentials: (nullable): an #ENamedParameters structure with credentials to use; can be %NULL
* to use those from the last call
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
* @callback: a #GAsyncReadyCallback to call when the request is satisfied
* @user_data: data to pass to the callback function
*
@@ -4908,7 +4904,7 @@ e_source_invoke_authenticate (ESource *source,
* e_source_invoke_authenticate_finish:
* @source: an #ESource
* @result: a #GAsyncResult
- * @error: (allow-none): return location for a #GError, or %NULL
+ * @error: return location for a #GError, or %NULL
*
* Finishes the operation started with e_source_invoke_authenticate().
*
@@ -4939,7 +4935,7 @@ e_source_invoke_authenticate_finish (ESource *source,
* @reason: an #ESourceCredentialsReason, why the credentials are required
* @certificate_pem: PEM-encoded secure connection certificate, or an empty string
* @certificate_errors: a bit-or of #GTlsCertificateFlags for secure connection certificate
- * @op_error: (allow-none): a #GError with a description of the previous credentials error, or %NULL
+ * @op_error: (nullable): a #GError with a description of the previous credentials error, or %NULL
*
* Emits localy (in this process only) the ESource::credentials-required
* signal with given parameters. That's the difference with e_source_invoke_credentials_required(),
@@ -4966,8 +4962,8 @@ e_source_emit_credentials_required (ESource *source,
* @out_certificate_pem: (out): PEM-encoded secure connection certificate, or an empty string
* @out_certificate_errors: (out): a bit-or of #GTlsCertificateFlags for secure connection certificate
* @out_op_error: (out): a #GError with a description of the previous credentials error
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
- * @error: (allow-none): return location for a #GError, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
+ * @error: return location for a #GError, or %NULL
*
* Retrieves the last used arguments of the 'credentials-required' signal emission.
* If there was none emitted yet, or a corresponding 'authenitcate' had been emitted
@@ -5081,7 +5077,7 @@ source_get_last_credentials_required_arguments_thread (GTask *task,
/**
* e_source_get_last_credentials_required_arguments:
* @source: an #ESource
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
* @callback: a #GAsyncReadyCallback to call when the request is satisfied
* @user_data: data to pass to the callback function
*
@@ -5122,7 +5118,7 @@ e_source_get_last_credentials_required_arguments (ESource *source,
* @out_certificate_pem: (out): PEM-encoded secure connection certificate, or an empty string
* @out_certificate_errors: (out): a bit-or of #GTlsCertificateFlags for secure connection certificate
* @out_op_error: (out): a #GError with a description of the previous credentials error
- * @error: (allow-none): return location for a #GError, or %NULL
+ * @error: return location for a #GError, or %NULL
*
* Finishes the operation started with e_source_get_last_credentials_required_arguments().
* See e_source_get_last_credentials_required_arguments_sync() for more information
@@ -5173,8 +5169,8 @@ e_source_get_last_credentials_required_arguments_finish (ESource *source,
/**
* e_source_unset_last_credentials_required_arguments_sync:
* @source: an #ESource
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
- * @error: (allow-none): return location for a #GError, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
+ * @error: return location for a #GError, or %NULL
*
* Unsets the last used arguments of the 'credentials-required' signal emission.
*
@@ -5221,7 +5217,7 @@ source_unset_last_credentials_required_arguments_thread (GTask *task,
/**
* e_source_unset_last_credentials_required_arguments:
* @source: an #ESource
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
* @callback: a #GAsyncReadyCallback to call when the request is satisfied
* @user_data: data to pass to the callback function
*
@@ -5257,7 +5253,7 @@ e_source_unset_last_credentials_required_arguments (ESource *source,
* e_source_unset_last_credentials_required_arguments_finish:
* @source: an #ESource
* @result: a #GAsyncResult
- * @error: (allow-none): return location for a #GError, or %NULL
+ * @error: return location for a #GError, or %NULL
*
* Finishes the operation started with e_source_unset_last_credentials_required_arguments().
*
diff --git a/src/libedataserver/e-webdav-discover.c b/src/libedataserver/e-webdav-discover.c
index 3b319cca0..50633b219 100644
--- a/src/libedataserver/e-webdav-discover.c
+++ b/src/libedataserver/e-webdav-discover.c
@@ -515,13 +515,12 @@ e_webdav_discover_setup_proxy_resolver (EWebDAVSession *webdav,
/**
* e_webdav_discover_sources:
* @source: an #ESource from which to take connection details
- * @url_use_path: (allow-none): optional URL override, or %NULL
+ * @url_use_path: (nullable): optional URL override, or %NULL
* @only_supports: bit-or of EWebDAVDiscoverSupports, to limit what type of sources to search
- * @credentials: (allow-none): credentials to use for authentication to the server
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request
- * is satisfied
- * @user_data: (closure): data to pass to the callback function
+ * @credentials: (nullable): credentials to use for authentication to the server
+ * @cancellable: optional #GCancellable object, or %NULL
+ * @callback: a #GAsyncReadyCallback to call when the request is satisfied
+ * @user_data: data to pass to the callback function
*
* Asynchronously runs discovery of the WebDAV sources (CalDAV and CardDAV), eventually
* limited by the @only_supports filter, which can be %E_WEBDAV_DISCOVER_SUPPORTS_NONE
@@ -558,9 +557,8 @@ e_webdav_discover_sources (ESource *source,
* @ref_source_func: (nullable) (scope async): optional callback to use to get an ESource
* @ref_source_func_user_data: (nullable): user data for @ref_source_func
* @cancellable: optional #GCancellable object, or %NULL
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request
- * is satisfied
- * @user_data: (closure): data to pass to the callback function
+ * @callback: a #GAsyncReadyCallback to call when the request is satisfied
+ * @user_data: data to pass to the callback function
*
* This is the same as e_webdav_discover_sources(), it only allows to
* provide a callback function (with its user_data), to reference an additional
@@ -603,16 +601,16 @@ e_webdav_discover_sources_full (ESource *source,
* e_webdav_discover_sources_finish:
* @source: an #ESource on which the operation was started
* @result: a #GAsyncResult
- * @out_certificate_pem: (out) (allow-none): optional return location
+ * @out_certificate_pem: (out) (optional): optional return location
* for a server SSL certificate in PEM format, when the operation failed
* with an SSL error
- * @out_certificate_errors: (out) (allow-none): optional #GTlsCertificateFlags,
+ * @out_certificate_errors: (out) (optional): optional #GTlsCertificateFlags,
* with certificate error flags when the operation failed with SSL error
- * @out_discovered_sources: (out) (element-type EWebDAVDiscoveredSource): a #GSList
+ * @out_discovered_sources: (out) (optional) (element-type EWebDAVDiscoveredSource): a #GSList
* of all discovered sources
- * @out_calendar_user_addresses: (out) (allow-none) (element-type utf8): a #GSList of
+ * @out_calendar_user_addresses: (out) (optional) (element-type utf8): a #GSList of
* all discovered mail addresses for calendar sources
- * @error: (allow-none): return location for a #GError, or %NULL
+ * @error: return location for a #GError, or %NULL
*
* Finishes the operation started with e_webdav_discover_sources(). If an
* error occurred, the function will set @error and return %FALSE. The function
@@ -699,20 +697,20 @@ e_webdav_discover_maybe_replace_auth_error (GError **target,
/**
* e_webdav_discover_sources_sync:
* @source: an #ESource from which to take connection details
- * @url_use_path: (allow-none): optional URL override, or %NULL
+ * @url_use_path: (nullable): optional URL override, or %NULL
* @only_supports: bit-or of EWebDAVDiscoverSupports, to limit what type of sources to search
- * @credentials: (allow-none): credentials to use for authentication to the server
- * @out_certificate_pem: (out) (allow-none): optional return location
+ * @credentials: (nullable): credentials to use for authentication to the server
+ * @out_certificate_pem: (out) (optional): optional return location
* for a server SSL certificate in PEM format, when the operation failed
* with an SSL error
- * @out_certificate_errors: (out) (allow-none): optional #GTlsCertificateFlags,
+ * @out_certificate_errors: (out) (optional): optional #GTlsCertificateFlags,
* with certificate error flags when the operation failed with SSL error
- * @out_discovered_sources: (out) (element-type EWebDAVDiscoveredSource): a #GSList
+ * @out_discovered_sources: (out) (optional) (element-type EWebDAVDiscoveredSource): a #GSList
* of all discovered sources
- * @out_calendar_user_addresses: (out) (allow-none) (element-type utf8): a #GSList of
+ * @out_calendar_user_addresses: (out) (optional) (element-type utf8): a #GSList of
* all discovered mail addresses for calendar sources
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
- * @error: (allow-none): return location for a #GError, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
+ * @error: return location for a #GError, or %NULL
*
* Synchronously runs discovery of the WebDAV sources (CalDAV and CardDAV), eventually
* limited by the @only_supports filter, which can be %E_WEBDAV_DISCOVER_SUPPORTS_NONE
@@ -790,14 +788,14 @@ e_webdav_discover_is_fatal_error (const GError *error)
* @credentials: (nullable): credentials to use for authentication to the server
* @ref_source_func: (nullable) (scope call): optional callback to use to get an ESource
* @ref_source_func_user_data: (nullable): user data for @ref_source_func
- * @out_certificate_pem: (out) (nullable): optional return location
+ * @out_certificate_pem: (out) (optional): optional return location
* for a server SSL certificate in PEM format, when the operation failed
* with an SSL error
- * @out_certificate_errors: (out) (nullable): optional #GTlsCertificateFlags,
+ * @out_certificate_errors: (out) (optional): optional #GTlsCertificateFlags,
* with certificate error flags when the operation failed with SSL error
- * @out_discovered_sources: (out) (element-type EWebDAVDiscoveredSource): a #GSList
+ * @out_discovered_sources: (out) (optional) (element-type EWebDAVDiscoveredSource): a #GSList
* of all discovered sources
- * @out_calendar_user_addresses: (out) (nullable) (element-type utf8): a #GSList of
+ * @out_calendar_user_addresses: (out) (optional) (element-type utf8): a #GSList of
* all discovered mail addresses for calendar sources
* @cancellable: optional #GCancellable object, or %NULL
* @error: return location for a #GError, or %NULL
diff --git a/src/libedataserverui/e-credentials-prompter-impl.c
b/src/libedataserverui/e-credentials-prompter-impl.c
index 54e2db1bf..9e2916a1e 100644
--- a/src/libedataserverui/e-credentials-prompter-impl.c
+++ b/src/libedataserverui/e-credentials-prompter-impl.c
@@ -86,7 +86,7 @@ e_credentials_prompter_impl_class_init (ECredentialsPrompterImplClass *klass)
* ECredentialsPrompterImpl::prompt-finished:
* @prompter_impl: an #ECredentialsPrompterImpl which emitted the signal
* @prompt_id: an ID of the prompt which was finished
- * @credentials: (allow-none): entered credentials, or %NULL for cancelled prompts
+ * @credentials: (nullable): entered credentials, or %NULL for cancelled prompts
*
* Emitted when a prompt of ID @prompt_id is finished.
*
@@ -139,7 +139,7 @@ e_credentials_prompter_impl_get_credentials_prompter (ECredentialsPrompterImpl *
* @prompt_id: a prompt ID to be passed to e_credentials_prompter_impl_prompt_finish()
* @auth_source: an #ESource, to prompt the credentials for (the source which asked for credentials)
* @cred_source: a parent #ESource, from which credentials were taken, or should be stored to
- * @error_text: (allow-none): an optional error text from the previous credentials prompt; can be %NULL
+ * @error_text: (nullable): an optional error text from the previous credentials prompt; can be %NULL
* @credentials: credentials, as saved in keyring; can be empty, but not %NULL
*
* Runs a credentials prompt for the @prompter_impl. The actual prompter implementation
@@ -182,7 +182,7 @@ e_credentials_prompter_impl_prompt (ECredentialsPrompterImpl *prompter_impl,
* e_credentials_prompter_impl_prompt_finish:
* @prompter_impl: an #ECredentialsPrompterImpl
* @prompt_id: a prompt ID
- * @credentials: (allow-none): credentials to use; can be %NULL for cancelled prompts
+ * @credentials: (nullable): credentials to use; can be %NULL for cancelled prompts
*
* The actual credentials prompt implementation finishes a previously started
* credentials prompt @prompt_id with ECredentialsPrompterImplClass::process_prompt()
diff --git a/src/libedataserverui/e-credentials-prompter.c b/src/libedataserverui/e-credentials-prompter.c
index 47a661e23..3532eedf8 100644
--- a/src/libedataserverui/e-credentials-prompter.c
+++ b/src/libedataserverui/e-credentials-prompter.c
@@ -1461,7 +1461,7 @@ e_credentials_prompter_get_dialog_parent_full (ECredentialsPrompter *prompter,
/**
* e_credentials_prompter_register_impl:
* @prompter: an #ECredentialsPrompter
- * @authentication_method: (allow-none): an authentication method to registr @prompter_impl for; or %NULL
+ * @authentication_method: (nullable): an authentication method to registr @prompter_impl for; or %NULL
* @prompter_impl: an #ECredentialsPrompterImpl
*
* Registers a prompter implementation for a given authentication method. If there is
@@ -1515,7 +1515,7 @@ e_credentials_prompter_register_impl (ECredentialsPrompter *prompter,
/**
* e_credentials_prompter_unregister_impl:
* @prompter: an #ECredentialsPrompter
- * @authentication_method: (allow-none): an authentication method to registr @prompter_impl for; or %NULL
+ * @authentication_method: (nullable): an authentication method to registr @prompter_impl for; or %NULL
* @prompter_impl: an #ECredentialsPrompterImpl
*
* Unregisters previously registered @prompter_impl for the given @autnetication_method with
@@ -1663,9 +1663,9 @@ e_credentials_prompter_process_source (ECredentialsPrompter *prompter,
* e_credentials_prompter_prompt:
* @prompter: an #ECredentialsPrompter
* @source: an #ESource, which prompt the credentials for
- * @error_text: (allow-none): Additional error text to show to a user, or %NULL
+ * @error_text: (nullable): Additional error text to show to a user, or %NULL
* @flags: a bit-or of #ECredentialsPrompterPromptFlags
- * @callback: (allow-none): a callback to call when the credentials are ready, or %NULL
+ * @callback: a callback to call when the credentials are ready, or %NULL
* @user_data: user data passed into @callback
*
* Asks the @prompter to prompt for credentials, which are returned
@@ -1706,8 +1706,8 @@ e_credentials_prompter_prompt (ECredentialsPrompter *prompter,
* e_credentials_prompter_prompt_finish:
* @prompter: an #ECredentialsPrompter
* @result: a #GAsyncResult
- * @out_source: (transfer full) (allow-none): optionally set to an #ESource, on which the prompt was
started; can be %NULL
- * @out_credentials: (transfer full): set to an #ENamedParameters with provied credentials
+ * @out_source: (transfer full) (out) (optional) (nullable): optionally set to an #ESource, on which the
prompt was started; can be %NULL
+ * @out_credentials: (transfer full) (out) (nullable): set to an #ENamedParameters with provied credentials
* @error: return location for a #GError, or %NULL
*
* Finishes a credentials prompt previously started with e_credentials_prompter_prompt().
@@ -1763,8 +1763,8 @@ e_credentials_prompter_prompt_finish (ECredentialsPrompter *prompter,
* @prompter: an #ECredentialsPrompter
* @async_result: a #GSimpleAsyncResult
* @source: an #ESource, on which the prompt was started
- * @credentials: (allow-none): credentials, as provided by a user, on %NULL, when the prompt was cancelled
- * @error: (allow-none): a resulting #GError, or %NULL
+ * @credentials: (nullable): credentials, as provided by a user, on %NULL, when the prompt was cancelled
+ * @error: a resulting #GError, or %NULL
*
* Completes an ongoing credentials prompt on idle, by finishing the @async_result.
* This function is meant to be used by an #ECredentialsPrompterImpl implementation.
@@ -1887,8 +1887,8 @@ credentials_prompter_prompt_sync (ECredentialsPrompter *prompter,
* @flags: a bit-or of #ECredentialsPrompterPromptFlags initial flags
* @func: (scope call): an #ECredentialsPrompterLoopPromptFunc user function to call to check provided
credentials
* @user_data: user data to pass to @func
- * @cancellable: (allow-none): an optional #GCancellable, or %NULL
- * @error: (allow-none): a #GError, to store any errors to, or %NULL
+ * @cancellable: an optional #GCancellable, or %NULL
+ * @error: a #GError, to store any errors to, or %NULL
*
* Runs a credentials prompt loop for @source, as long as the @func doesn't
* indicate that the provided credentials can be used to successfully
diff --git a/src/libedataserverui/e-trust-prompt.c b/src/libedataserverui/e-trust-prompt.c
index 0e4ce26ad..db0e53ad0 100644
--- a/src/libedataserverui/e-trust-prompt.c
+++ b/src/libedataserverui/e-trust-prompt.c
@@ -373,12 +373,12 @@ e_trust_prompt_run_with_dialog_ready_callback (GtkWindow *parent,
/**
* e_trust_prompt_run_modal:
* @parent: A #GtkWindow to use as a parent for the trust prompt dialog
- * @source_extension: (allow-none): an #ESource extension, to identify a kind of the source; or %NULL
- * @source_display_name: (allow-none): an #ESource display name, to identify what prompts; or %NULL
+ * @source_extension: (nullable): an #ESource extension, to identify a kind of the source; or %NULL
+ * @source_display_name: (nullable): an #ESource display name, to identify what prompts; or %NULL
* @host: a host name to which the certificate belongs
* @certificate_pem: a PEM-encoded certificate for which to show the trust prompt
* @certificate_errors: errors of the @certificate_pem
- * @error_text: (allow-none): an optional error text to show in the dialog; can be %NULL
+ * @error_text: (nullable): an optional error text to show in the dialog; can be %NULL
*
* Runs modal (doesn't return until the dialog is closed) a trust prompt dialog,
* it is a prompt whether a user wants to accept or reject the @certificate_pem
@@ -514,9 +514,9 @@ trust_prompt_get_host_from_url (const gchar *url)
* @source: an #ESource, with %E_SOURCE_EXTENSION_AUTHENTICATION
* @certificate_pem: a PEM-encoded certificate for which to show the trust prompt
* @certificate_errors: errors of the @certificate_pem
- * @error_text: (allow-none): an optional error text to show in the dialog; can be %NULL
+ * @error_text: (nullable): an optional error text to show in the dialog; can be %NULL
* @allow_source_save: whether can also save any @source changes
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: a #GCancellable, or %NULL
* @callback: a callback to call, when the prompt (an @source save) is done
* @user_data: user data passed into @callback
*
diff --git a/src/libedataserverui/e-webdav-discover-widget.c b/src/libedataserverui/e-webdav-discover-widget.c
index 7bbb7db99..812a2f513 100644
--- a/src/libedataserverui/e-webdav-discover-widget.c
+++ b/src/libedataserverui/e-webdav-discover-widget.c
@@ -104,8 +104,8 @@ e_webdav_discover_content_init (EWebDAVDiscoverContent *self)
/**
* e_webdav_discover_content_new:
* @credentials_prompter: an #ECredentialsPrompter to use to ask for credentials
- * @source: (allow-none): optional #ESource to use for authentication, or %NULL
- * @base_url: (allow-none): optional base URL to use for discovery, or %NULL
+ * @source: (nullable): optional #ESource to use for authentication, or %NULL
+ * @base_url: (nullable): optional base URL to use for discovery, or %NULL
* @supports_filter: a bit-or of #EWebDAVDiscoverSupports, a filter to limit what source
* types will be shown in the dialog content; use %E_WEBDAV_DISCOVER_SUPPORTS_NONE
* to show all
@@ -808,11 +808,10 @@ e_webdav_discover_info_bar_response_cb (GtkInfoBar *info_bar,
/**
* e_webdav_discover_content_refresh:
* @content: (type EWebDAVDiscoverContent): an #EWebDAVDiscoverContent
- * @display_name: (allow-none): optional display name to use for scratch sources
- * @cancellable: (allow-none): optional #GCancellable object, or %NULL
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request
- * is satisfied
- * @user_data: (closure): data to pass to the callback function
+ * @display_name: (nullable): optional display name to use for scratch sources
+ * @cancellable: optional #GCancellable object, or %NULL
+ * @callback: a #GAsyncReadyCallback to call when the request is satisfied
+ * @user_data: data to pass to the callback function
*
* Asynchronously starts refresh of the @content. This means to access the server
* and search it for available sources. The @content shows a feedback and a Cancel
@@ -929,7 +928,7 @@ e_webdav_discover_content_refresh (GtkWidget *content,
* e_webdav_discover_content_refresh_finish:
* @content: (type EWebDAVDiscoverContent): an #EWebDAVDiscoverContent
* @result: a #GAsyncResult
- * @error: (allow-none): return location for a #GError, or %NULL
+ * @error: return location for a #GError, or %NULL
*
* Finishes the operation started with e_webdav_discover_content_refresh(). If an
* error occurred, the function will set @error and return %FALSE. There is
@@ -971,7 +970,7 @@ e_webdav_discover_info_bar_error_response_cb (GtkInfoBar *info_bar,
/**
* e_webdav_discover_content_show_error:
* @content: (type EWebDAVDiscoverContent): an #EWebDAVDiscoverContent
- * @error: (allow-none): a #GError to show in the UI, or %NULL
+ * @error: a #GError to show in the UI, or %NULL
*
* Shows the @error within @content, unless it's a #G_IO_ERROR_CANCELLED, or %NULL,
* which are safely ignored. The advantage of this function is that the error
@@ -1056,7 +1055,7 @@ e_webdav_discover_dialog_init (EWebDAVDiscoverDialog *self)
* @title: title of the window
* @credentials_prompter: an #ECredentialsPrompter to use to ask for credentials
* @source: an #ESource to use for authentication
- * @base_url: (allow-none): optional base URL to use for discovery, or %NULL
+ * @base_url: (nullable): optional base URL to use for discovery, or %NULL
* @supports_filter: a bit-or of #EWebDAVDiscoverSupports, a filter to limit what source
* types will be shown in the dialog content; use %E_WEBDAV_DISCOVER_SUPPORTS_NONE
* to show all
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
