[evolution-data-server] Revert some parts of the M!79

From: Milan Crha <mcrha src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution-data-server] Revert some parts of the M!79
Date: Thu, 27 Jan 2022 17:19:37 +0000 (UTC)
commit 587717d6d33c40bb1d15e4084eddf131d246d6ed
Author: Milan Crha <mcrha redhat com>
Date:   Thu Jan 27 18:18:15 2022 +0100

    Revert some parts of the M!79
    
    When a function returns NULL on error and sets the error in
    an out parameter, then its return value is not 'nullable'.
    
    Related to https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/79

 src/addressbook/libebook-contacts/e-address-western.c      |  4 ++--
 src/addressbook/libebook-contacts/e-contact.c              |  9 +++------
 src/addressbook/libebook-contacts/e-phone-number.c         |  2 +-
 src/addressbook/libebook/e-book-client.c                   | 13 ++++++-------
 src/addressbook/libedata-book/e-book-backend-sqlitedb.c    |  7 +++----
 src/addressbook/libedata-book/e-book-backend-sync.c        |  8 ++++----
 src/addressbook/libedata-book/e-book-backend.c             |  8 ++++----
 src/addressbook/libedata-book/e-book-sqlite.c              |  2 +-
 src/addressbook/libedata-book/e-data-book-cursor-cache.c   |  2 +-
 src/addressbook/libedata-book/e-data-book-cursor-sqlite.c  |  2 +-
 src/addressbook/libedata-book/e-data-book-view.c           |  2 +-
 src/addressbook/libedata-book/e-data-book.c                |  2 +-
 src/calendar/libecal/e-cal-check-timezones.c               |  4 ++--
 src/calendar/libedata-cal/e-cal-backend.c                  | 14 +++++++-------
 src/camel/camel-cipher-context.c                           |  8 ++++----
 src/camel/camel-data-cache.c                               | 12 +++++-------
 src/camel/camel-folder-search.c                            |  6 +++---
 src/camel/camel-folder.c                                   |  4 ++--
 src/camel/camel-network-service.c                          |  2 +-
 src/camel/camel-provider.c                                 |  2 +-
 src/camel/camel-session.c                                  |  4 ++--
 src/camel/camel-stream-fs.c                                |  2 +-
 src/camel/providers/imapx/camel-imapx-folder.c             |  2 +-
 src/camel/providers/imapx/camel-imapx-list-response.c      |  2 +-
 src/camel/providers/imapx/camel-imapx-namespace-response.c |  2 +-
 src/camel/providers/imapx/camel-imapx-status-response.c    |  2 +-
 src/camel/providers/imapx/camel-imapx-utils.c              |  2 +-
 src/camel/providers/pop3/camel-pop3-engine.c               |  5 +----
 src/camel/providers/pop3/camel-pop3-store.c                |  2 +-
 src/libebackend/e-server-side-source.c                     |  2 +-
 src/libedataserver/e-collator.c                            |  2 +-
 src/libedataserver/e-soup-session.c                        |  2 +-
 src/libedataserver/e-source-registry.c                     |  4 ++--
 src/libedataserver/e-source.c                              |  4 ++--
 34 files changed, 70 insertions(+), 80 deletions(-)
---
diff --git a/src/addressbook/libebook-contacts/e-address-western.c 
b/src/addressbook/libebook-contacts/e-address-western.c
index b76e1d25b..6a769fc8a 100644
--- a/src/addressbook/libebook-contacts/e-address-western.c
+++ b/src/addressbook/libebook-contacts/e-address-western.c
@@ -305,13 +305,13 @@ e_address_western_extract_street (gchar *line,
 
 /**
  * e_address_western_parse:
- * @in_address: a string representing a mailing address
+ * @in_address: (nullable): a string representing a mailing address
  *
  * Parses a string representing a mailing address into a
  * structure of type #EAddressWestern.
  *
  * Returns: (nullable): A new #EAddressWestern structure, or %NULL if
- * the parsing failed.
+ *    the parsing failed or when the @in_address was %NULL.
  **/
 EAddressWestern *
 e_address_western_parse (const gchar *in_address)
diff --git a/src/addressbook/libebook-contacts/e-contact.c b/src/addressbook/libebook-contacts/e-contact.c
index 66013fef4..561779208 100644
--- a/src/addressbook/libebook-contacts/e-contact.c
+++ b/src/addressbook/libebook-contacts/e-contact.c
@@ -1678,8 +1678,7 @@ e_contact_field_type (EContactField field_id)
  *
  * Gets the string representation of @field_id.
  *
- * Returns: (nullable): The string representation of @field_id, or %NULL
- * if it doesn't exist.
+ * Returns: The string representation of @field_id
  **/
 const gchar *
 e_contact_field_name (EContactField field_id)
@@ -1696,8 +1695,7 @@ e_contact_field_name (EContactField field_id)
  * Gets a human-readable, translated string representation
  * of @field_id.
  *
- * Returns: (nullable): The human-readable representation of @field_id, or %NULL
- * if it doesn't exist.
+ * Returns: The human-readable representation of @field_id
  **/
 const gchar *
 e_contact_pretty_name (EContactField field_id)
@@ -1718,8 +1716,7 @@ e_contact_pretty_name (EContactField field_id)
  *
  * Gets the vcard attribute corresponding to @field_id, as a string.
  *
- * Returns: (nullable): The vcard attribute corresponding to @field_id,
- * or %NULL if it doesn't exist.
+ * Returns: The vcard attribute corresponding to @field_id
  **/
 const gchar *
 e_contact_vcard_attribute (EContactField field_id)
diff --git a/src/addressbook/libebook-contacts/e-phone-number.c 
b/src/addressbook/libebook-contacts/e-phone-number.c
index c735becca..fd2eb4dc2 100644
--- a/src/addressbook/libebook-contacts/e-phone-number.c
+++ b/src/addressbook/libebook-contacts/e-phone-number.c
@@ -172,7 +172,7 @@ e_phone_number_get_default_region (GError **error)
  * If the number is guaranteed to start with a '+' followed by the country
  * calling code, then "ZZ" can be passed for @region_code.
  *
- * Returns: (transfer full) (nullable): a new EPhoneNumber instance on success,
+ * Returns: (transfer full): a new #EPhoneNumber instance on success,
  * or %NULL on error. Call e_phone_number_free() to release this instance.
  *
  * Since: 3.8
diff --git a/src/addressbook/libebook/e-book-client.c b/src/addressbook/libebook/e-book-client.c
index c8451c3e2..7888e6913 100644
--- a/src/addressbook/libebook/e-book-client.c
+++ b/src/addressbook/libebook/e-book-client.c
@@ -1338,8 +1338,8 @@ e_book_client_init (EBookClient *client)
  * function will have a descriptive prefix that includes the display
  * name of @source.
  *
- * Returns: (transfer full) (type EBookClient) (nullable): a new #EBookClient,
- * or %NULL
+ * Returns: (transfer full) (type EBookClient): a new #EBookClient,
+ *    or %NULL on error
  *
  * Since: 3.8
  **/
@@ -1588,8 +1588,8 @@ e_book_client_connect (ESource *source,
  * function will have a descriptive prefix that includes the display
  * name of the #ESource passed to e_book_client_connect().
  *
- * Returns: (transfer full) (type EBookClient) (nullable): a new #EBookClient,
- * or %NULL
+ * Returns: (transfer full) (type EBookClient): a new #EBookClient,
+ * or %NULL on error
  *
  * Since: 3.8
  **/
@@ -1719,7 +1719,7 @@ connect_direct (EBookClient *client,
  * Like e_book_client_connect_sync(), except creates the book client for
  * direct read access to the underlying addressbook.
  *
- * Returns: (transfer full) (type EBookClient) (nullable): a new but unopened #EBookClient.
+ * Returns: (transfer full) (type EBookClient): a new but unopened #EBookClient or %NULL on error.
  *
  * Since: 3.8
  **/
@@ -1865,8 +1865,7 @@ e_book_client_connect_direct (ESource *source,
  * function will have a descriptive prefix that includes the display
  * name of the #ESource passed to e_book_client_connect_direct().
  *
- * Returns: (transfer full) (type EBookClient) (nullable): a new #EBookClient,
- * or %NULL
+ * Returns: (transfer full) (type EBookClient): a new #EBookClient, or %NULL on error
  *
  * Since: 3.12
  **/
diff --git a/src/addressbook/libedata-book/e-book-backend-sqlitedb.c 
b/src/addressbook/libedata-book/e-book-backend-sqlitedb.c
index 0d7ec138a..e5eca3ed5 100644
--- a/src/addressbook/libedata-book/e-book-backend-sqlitedb.c
+++ b/src/addressbook/libedata-book/e-book-backend-sqlitedb.c
@@ -3000,7 +3000,7 @@ store_data_to_vcard (gpointer ref,
  * In either case, @with_all_required_fields if specified, will be updated to reflect whether
  * the returned vcard string satisfies the passed 'fields_of_interest' parameter.
  * 
- * Returns: (transfer full) (nullable): The vcard string for @uid or %NULL if @uid was not found.
+ * Returns: (transfer full): The vcard string for @uid or %NULL if @uid was not found.
  *
  * Since: 3.2
  *
@@ -4803,8 +4803,7 @@ e_book_backend_sqlitedb_set_has_partial_content (EBookBackendSqliteDB *ebsdb,
  * not being present in @ebsdb, you must pass the @error parameter and
  * check whether it was set by this function.</para></note>
  *
- * Returns: (transfer full) (nullable): The extra data previously set
- * for @uid, or %NULL
+ * Returns: (transfer full): The extra data previously set for @uid, or %NULL on error
  *
  * Since: 3.2
  *
@@ -5094,7 +5093,7 @@ e_book_backend_sqlitedb_set_key_value (EBookBackendSqliteDB *ebsdb,
  *
  * Obsolete, do not use, this always ends with an error.
  *
- * Returns: (element-type utf8) (transfer full) (nullable): %NULL
+ * Returns: (element-type utf8) (transfer full): %NULL on error
  *
  * Since: 3.2
  *
diff --git a/src/addressbook/libedata-book/e-book-backend-sync.c 
b/src/addressbook/libedata-book/e-book-backend-sync.c
index e356fbdc8..b0fcf1f97 100644
--- a/src/addressbook/libedata-book/e-book-backend-sync.c
+++ b/src/addressbook/libedata-book/e-book-backend-sync.c
@@ -490,7 +490,7 @@ e_book_backend_sync_remove_contacts (EBookBackendSync *backend,
  *
  * If an error occurs, the function will set @error and return %NULL.
  *
- * Returns: (transfer full) (nullable): an #EContact, or %NULL
+ * Returns: (transfer full): an #EContact, or %NULL on error
  *
  * Since: 3.34
  **/
@@ -502,17 +502,17 @@ e_book_backend_sync_get_contact (EBookBackendSync *backend,
 {
        EBookBackendSyncClass *klass;
 
-       g_return_val_if_fail (E_IS_BOOK_BACKEND_SYNC (backend), FALSE);
+       g_return_val_if_fail (E_IS_BOOK_BACKEND_SYNC (backend), NULL);
 
        klass = E_BOOK_BACKEND_SYNC_GET_CLASS (backend);
-       g_return_val_if_fail (klass != NULL, FALSE);
+       g_return_val_if_fail (klass != NULL, NULL);
 
        if (klass->get_contact_sync)
                return klass->get_contact_sync (backend, uid, cancellable, error);
 
        g_propagate_error (error, e_client_error_create (E_CLIENT_ERROR_NOT_SUPPORTED, NULL));
 
-       return FALSE;
+       return NULL;
 }
 
 /**
diff --git a/src/addressbook/libedata-book/e-book-backend.c b/src/addressbook/libedata-book/e-book-backend.c
index 8428be529..cde26456e 100644
--- a/src/addressbook/libedata-book/e-book-backend.c
+++ b/src/addressbook/libedata-book/e-book-backend.c
@@ -1991,7 +1991,7 @@ e_book_backend_remove_contacts_finish (EBookBackend *backend,
  *
  * If an error occurs, the function will set @error and return %NULL.
  *
- * Returns: (transfer full) (nullable): an #EContact, or %NULL
+ * Returns: (transfer full): an #EContact, or %NULL on error
  *
  * Since: 3.10
  **/
@@ -2136,7 +2136,7 @@ e_book_backend_get_contact (EBookBackend *backend,
  *
  * If an error occurred, the function will set @error and return %NULL.
  *
- * Returns: (transfer full) (nullable): an #EContact, or %NULL
+ * Returns: (transfer full): an #EContact, or %NULL on error
  *
  * Since: 3.10
  **/
@@ -3406,8 +3406,8 @@ e_book_backend_prepare_for_completion (EBookBackend *backend,
  * The returned cursor belongs to @backend and should be destroyed
  * with e_book_backend_delete_cursor() when no longer needed.
  *
- * Returns: (transfer none) (nullable): A newly created cursor, the cursor
- * belongs to the backend and should not be unreffed, or %NULL
+ * Returns: (transfer none): A newly created cursor, the cursor belongs
+ *    to the backend and should not be unreffed, or %NULL on error
  *
  * Since: 3.12
  */
diff --git a/src/addressbook/libedata-book/e-book-sqlite.c b/src/addressbook/libedata-book/e-book-sqlite.c
index fd3f44b39..d09163798 100644
--- a/src/addressbook/libedata-book/e-book-sqlite.c
+++ b/src/addressbook/libedata-book/e-book-sqlite.c
@@ -6651,7 +6651,7 @@ e_book_sqlite_new (const gchar *path,
  * if at all possible, however in some cases the vcards must be stored in some
  * other storage.
  *
- * Returns: (transfer full) (nullable): The newly created #EBookSqlite, or %NULL if
+ * Returns: (transfer full): The newly created #EBookSqlite, or %NULL if
  * opening or creating the addressbook failed.
  *
  * Since: 3.12
diff --git a/src/addressbook/libedata-book/e-data-book-cursor-cache.c 
b/src/addressbook/libedata-book/e-data-book-cursor-cache.c
index c1a249160..c2cf9d69b 100644
--- a/src/addressbook/libedata-book/e-data-book-cursor-cache.c
+++ b/src/addressbook/libedata-book/e-data-book-cursor-cache.c
@@ -389,7 +389,7 @@ e_data_book_cursor_cache_init (EDataBookCursorCache *cache_cursor)
  * This is suitable cursor type for any backend which stores its contacts
  * using the #EBookCache object. The #EBookMetaBackend does that transparently.
  *
- * Returns: (transfer full) (nullable): A newly created #EDataBookCursor, or %NULL if cursor creation failed.
+ * Returns: (transfer full): A newly created #EDataBookCursor, or %NULL if cursor creation failed.
  *
  * Since: 3.26
  */
diff --git a/src/addressbook/libedata-book/e-data-book-cursor-sqlite.c 
b/src/addressbook/libedata-book/e-data-book-cursor-sqlite.c
index eb9796a6c..6ba42799b 100644
--- a/src/addressbook/libedata-book/e-data-book-cursor-sqlite.c
+++ b/src/addressbook/libedata-book/e-data-book-cursor-sqlite.c
@@ -504,7 +504,7 @@ e_data_book_cursor_sqlite_load_locale (EDataBookCursor *cursor,
  * This is a suitable cursor type for any backend which stores its contacts
  * using the #EBookSqlite object.
  *
- * Returns: (transfer full) (nullable): A newly created #EDataBookCursor, or %NULL if cursor creation failed.
+ * Returns: (transfer full): A newly created #EDataBookCursor, or %NULL if cursor creation failed.
  *
  * Since: 3.12
  */
diff --git a/src/addressbook/libedata-book/e-data-book-view.c 
b/src/addressbook/libedata-book/e-data-book-view.c
index bf803c40e..e16c27526 100644
--- a/src/addressbook/libedata-book/e-data-book-view.c
+++ b/src/addressbook/libedata-book/e-data-book-view.c
@@ -688,7 +688,7 @@ e_data_book_view_init (EDataBookView *view)
  * @connection at @object_path.  If an error occurs while exporting,
  * the function sets @error and returns %NULL.
  *
- * Returns: (nullable): an #EDataBookView
+ * Returns: an #EDataBookView or %NULL on error
  */
 EDataBookView *
 e_data_book_view_new (EBookBackend *backend,
diff --git a/src/addressbook/libedata-book/e-data-book.c b/src/addressbook/libedata-book/e-data-book.c
index 5773214cf..2d48488b2 100644
--- a/src/addressbook/libedata-book/e-data-book.c
+++ b/src/addressbook/libedata-book/e-data-book.c
@@ -2063,7 +2063,7 @@ e_data_book_init (EDataBook *data_book)
  * method invocations and forwards them to the @backend.  If the AddressBook
  * interface fails to export, the function sets @error and returns %NULL.
  *
- * Returns: (nullable): an #EDataBook, or %NULL on error
+ * Returns: an #EDataBook, or %NULL on error
  **/
 EDataBook *
 e_data_book_new (EBookBackend *backend,
diff --git a/src/calendar/libecal/e-cal-check-timezones.c b/src/calendar/libecal/e-cal-check-timezones.c
index 6648de6ef..4ad4b1594 100644
--- a/src/calendar/libecal/e-cal-check-timezones.c
+++ b/src/calendar/libecal/e-cal-check-timezones.c
@@ -71,8 +71,8 @@ e_cal_match_location (const gchar *location)
  * Matches @tzid against the system timezone definitions
  * and returns the matching TZID, or %NULL if none found
  *
- * Returns: (nullable): The matching TZID, or %NULL
- * if none found
+ * Returns: (nullable): The matching TZID, or %NULL if none found or for UTC
+ *
  * Since: 2.24
  */
 const gchar *
diff --git a/src/calendar/libedata-cal/e-cal-backend.c b/src/calendar/libedata-cal/e-cal-backend.c
index 04004da44..5eda277e9 100644
--- a/src/calendar/libedata-cal/e-cal-backend.c
+++ b/src/calendar/libedata-cal/e-cal-backend.c
@@ -2199,7 +2199,7 @@ e_cal_backend_refresh_finish (ECalBackend *backend,
  *
  * If an error occurs, the function will set @error and return %NULL.
  *
- * Returns: (nullable): an #ECalComponent, or %NULL
+ * Returns: an #ECalComponent, or %NULL on error
  *
  * Since: 3.10
  **/
@@ -2344,7 +2344,7 @@ e_cal_backend_get_object (ECalBackend *backend,
  *
  * If an error occurs, the function will set @error and return %NULL.
  *
- * Returns: (nullable): an #ECalComponent, or %NULL
+ * Returns: an #ECalComponent, or %NULL on error
  *
  * Since: 3.10
  **/
@@ -2368,7 +2368,7 @@ e_cal_backend_get_object_finish (ECalBackend *backend,
        cal_backend_unblock_operations (backend, simple);
 
        if (g_simple_async_result_propagate_error (simple, error))
-               return FALSE;
+               return NULL;
 
        calobj = g_queue_pop_head (&async_context->result_queue);
 
@@ -3705,7 +3705,7 @@ e_cal_backend_receive_objects_finish (ECalBackend *backend,
  *
  * If an error occurs, the function will set @error and return %NULL.
  *
- * Returns: (nullable): a vCalendar string, or %NULL
+ * Returns: a vCalendar string, or %NULL on error
  *
  * Since: 3.10
  **/
@@ -3854,7 +3854,7 @@ e_cal_backend_send_objects (ECalBackend *backend,
  *
  * If an error occurs, the function will set @error and return %NULL.
  *
- * Returns: (nullable): a newly allocated vCalendar string, or %NULL
+ * Returns: a newly allocated vCalendar string, or %NULL on error
  *
  * Since: 3.10
  **/
@@ -4302,7 +4302,7 @@ e_cal_backend_discard_alarm_finish (ECalBackend *backend,
  *
  * If an error occurs, the function will set @error and return %NULL.
  *
- * Returns: (nullable): an iCalendar string, or %NULL
+ * Returns: an iCalendar string, or %NULL on error
  *
  * Since: 3.10
  **/
@@ -4440,7 +4440,7 @@ e_cal_backend_get_timezone (ECalBackend *backend,
  *
  * If an error occurred, the function will set @error and return %NULL.
  *
- * Returns: (nullable): an iCalendar string, or %NULL
+ * Returns: an iCalendar string, or %NULL on error
  *
  * Since: 3.10
  **/
diff --git a/src/camel/camel-cipher-context.c b/src/camel/camel-cipher-context.c
index 99eba090e..8013ba7d5 100644
--- a/src/camel/camel-cipher-context.c
+++ b/src/camel/camel-cipher-context.c
@@ -456,7 +456,7 @@ camel_cipher_context_sign_finish (CamelCipherContext *context,
  *
  * Verifies the signature.
  *
- * Returns: (nullable): a #CamelCipherValidity structure containing information
+ * Returns: a #CamelCipherValidity structure containing information
  * about the integrity of the input stream, or %NULL on failure to
  * execute at all
  **/
@@ -575,7 +575,7 @@ camel_cipher_context_verify (CamelCipherContext *context,
  *
  * Finishes the operation started with camel_cipher_context_verify().
  *
- * Returns: (nullable): a #CamelCipherValidity structure containing information
+ * Returns: a #CamelCipherValidity structure containing information
  * about the integrity of the input stream, or %NULL on failure to
  * execute at all
  *
@@ -784,7 +784,7 @@ camel_cipher_context_encrypt_finish (CamelCipherContext *context,
  *
  * Decrypts @ipart into @opart.
  *
- * Returns: (nullable): a validity/encryption status, or %NULL on error
+ * Returns: a validity/encryption status, or %NULL on error
  *
  * Since: 3.0
  **/
@@ -915,7 +915,7 @@ camel_cipher_context_decrypt (CamelCipherContext *context,
  *
  * Finishes the operation started with camel_cipher_context_decrypt().
  *
- * Returns: (nullable): a validity/encryption status, or %NULL on error
+ * Returns: a validity/encryption status, or %NULL on error
  *
  * Since: 3.0
  **/
diff --git a/src/camel/camel-data-cache.c b/src/camel/camel-data-cache.c
index f0c52ff17..96ca9f491 100644
--- a/src/camel/camel-data-cache.c
+++ b/src/camel/camel-data-cache.c
@@ -184,7 +184,7 @@ camel_data_cache_init (CamelDataCache *data_cache)
  *
  * Create a new data cache.
  *
- * Returns: (nullable): A new cache object, or %NULL if the base path cannot
+ * Returns: A new cache object, or %NULL if the base path cannot
  *    be written to.
  **/
 CamelDataCache *
@@ -445,8 +445,7 @@ data_cache_path (CamelDataCache *cdc,
  * The returned #GIOStream is referenced for thread-safety and must be
  * unreferenced with g_object_unref() when finished with it.
  *
- * Returns: (transfer full) (nullable): a #GIOStream for the new cache item,
- * or %NULL
+ * Returns: (transfer full): a #GIOStream for the new cache item, or %NULL on error
  **/
 GIOStream *
 camel_data_cache_add (CamelDataCache *cdc,
@@ -485,7 +484,7 @@ camel_data_cache_add (CamelDataCache *cdc,
 
        g_free (real);
 
-       return G_IO_STREAM (stream);
+       return stream ? G_IO_STREAM (stream) : NULL;
 }
 
 /**
@@ -502,8 +501,7 @@ camel_data_cache_add (CamelDataCache *cdc,
  * The returned #GIOStream is referenced for thread-safety and must be
  * unreferenced with g_object_unref() when finished with it.
  *
- * Returns: (transfer full) (nullable): a #GIOStream for the requested cache
- * item, or %NULL
+ * Returns: (transfer full): a #GIOStream for the requested cache item, or %NULL on error
  **/
 GIOStream *
 camel_data_cache_get (CamelDataCache *cdc,
@@ -544,7 +542,7 @@ camel_data_cache_get (CamelDataCache *cdc,
 exit:
        g_free (real);
 
-       return G_IO_STREAM (stream);
+       return stream ? G_IO_STREAM (stream) : NULL;
 }
 
 /**
diff --git a/src/camel/camel-folder-search.c b/src/camel/camel-folder-search.c
index f19866e6d..319166651 100644
--- a/src/camel/camel-folder-search.c
+++ b/src/camel/camel-folder-search.c
@@ -2390,9 +2390,9 @@ fail:
  * Run a search.  Search must have had Folder already set on it, and
  * it must implement summaries.
  *
- * Returns: (element-type utf8) (transfer full) (nullable): a #GPtrArray with
- *    matching UIDs, or %NULL on error. Use camel_folder_search_free_result()
- *    to free it when no longer needed.
+ * Returns: (element-type utf8) (transfer full): a #GPtrArray with matching UIDs,
+ *    or %NULL on error. Use camel_folder_search_free_result() to free it when
+ *    no longer needed.
  **/
 GPtrArray *
 camel_folder_search_search (CamelFolderSearch *search,
diff --git a/src/camel/camel-folder.c b/src/camel/camel-folder.c
index d0f8d1739..f18fbcbb2 100644
--- a/src/camel/camel-folder.c
+++ b/src/camel/camel-folder.c
@@ -3662,7 +3662,7 @@ camel_folder_get_message_finish (CamelFolder *folder,
  * If quotas are not supported for @folder, the function returns %NULL
  * and sets @error to #G_IO_ERROR_NOT_SUPPORTED.
  *
- * Returns: (nullable): a #CamelFolderQuotaInfo, or %NULL
+ * Returns: a #CamelFolderQuotaInfo, or %NULL on error
  *
  * Since: 3.2
  **/
@@ -3769,7 +3769,7 @@ camel_folder_get_quota_info (CamelFolder *folder,
  * If quotas are not supported for @folder, the function returns %NULL
  * and sets @error to #G_IO_ERROR_NOT_SUPPORTED.
  *
- * Returns: (nullable): a #CamelFolderQuotaInfo, or %NULL
+ * Returns: a #CamelFolderQuotaInfo, or %NULL on error
  *
  * Since: 3.2
  **/
diff --git a/src/camel/camel-network-service.c b/src/camel/camel-network-service.c
index 5203a11ea..b74353e7f 100644
--- a/src/camel/camel-network-service.c
+++ b/src/camel/camel-network-service.c
@@ -924,7 +924,7 @@ camel_network_service_get_host_reachable (CamelNetworkService *service)
  * connection attempt is cancelled, the function sets @error and returns
  * %NULL.
  *
- * Returns: (transfer full) (nullable): a #GIOStream, or %NULL
+ * Returns: (transfer full): a #GIOStream, or %NULL on error
  *
  * Since: 3.2
  **/
diff --git a/src/camel/camel-provider.c b/src/camel/camel-provider.c
index 9f2ad3879..40299649e 100644
--- a/src/camel/camel-provider.c
+++ b/src/camel/camel-provider.c
@@ -466,7 +466,7 @@ camel_provider_list (gboolean load)
  * The returned #CamelProvider is owned by Camel and should not be
  * modified or freed.
  *
- * Returns: (nullable): a #CamelProvider for @protocol, or %NULL
+ * Returns: a #CamelProvider for @protocol, or %NULL on error
  **/
 CamelProvider *
 camel_provider_get (const gchar *protocol,
diff --git a/src/camel/camel-session.c b/src/camel/camel-session.c
index 883134142..9e57fce09 100644
--- a/src/camel/camel-session.c
+++ b/src/camel/camel-session.c
@@ -896,7 +896,7 @@ camel_session_ref_network_monitor (CamelSession *session)
  * The returned #CamelService is referenced for thread-safety and must be
  * unreferenced with g_object_unref() when finished with it.
  *
- * Returns: (transfer full) (nullable): a #CamelService instance, or %NULL
+ * Returns: (transfer full): a #CamelService instance, or %NULL on error
  *
  * Since: 3.2
  **/
@@ -1155,7 +1155,7 @@ camel_session_remove_services (CamelSession *session)
  * the user did not provide the information. The caller must g_free()
  * the information returned when it is done with it.
  *
- * Returns: (nullable): the authentication information or %NULL
+ * Returns: the authentication information or %NULL on error
  **/
 gchar *
 camel_session_get_password (CamelSession *session,
diff --git a/src/camel/camel-stream-fs.c b/src/camel/camel-stream-fs.c
index 656c4bbad..a21ea673d 100644
--- a/src/camel/camel-stream-fs.c
+++ b/src/camel/camel-stream-fs.c
@@ -304,7 +304,7 @@ camel_stream_fs_new_with_fd (gint fd)
  * Creates a new #CamelStreamFs corresponding to the named file, flags,
  * and mode.
  *
- * Returns: (nullable): the new stream, or %NULL on error.
+ * Returns: the new stream, or %NULL on error
  **/
 CamelStream *
 camel_stream_fs_new_with_name (const gchar *name,
diff --git a/src/camel/providers/imapx/camel-imapx-folder.c b/src/camel/providers/imapx/camel-imapx-folder.c
index 2f9819378..09d4a2c94 100644
--- a/src/camel/providers/imapx/camel-imapx-folder.c
+++ b/src/camel/providers/imapx/camel-imapx-folder.c
@@ -1384,7 +1384,7 @@ camel_imapx_folder_set_mailbox (CamelIMAPXFolder *folder,
  * The returned #CamelIMAPXMailbox is referenced for thread-safety and
  * should be unreferenced with g_object_unref() when finished with it.
  *
- * Returns: (nullable): a #CamelIMAPXMailbox, or %NULL
+ * Returns: a #CamelIMAPXMailbox, or %NULL on error
  *
  * Since: 3.12
  **/
diff --git a/src/camel/providers/imapx/camel-imapx-list-response.c 
b/src/camel/providers/imapx/camel-imapx-list-response.c
index e1ed35534..13123e545 100644
--- a/src/camel/providers/imapx/camel-imapx-list-response.c
+++ b/src/camel/providers/imapx/camel-imapx-list-response.c
@@ -292,7 +292,7 @@ imapx_list_response_parse_extended_item (CamelIMAPXInputStream *stream,
  * stores the response data in a new #CamelIMAPXListResponse.  If an error
  * occurs, the function sets @error and returns %NULL.
  *
- * Returns: (nullable): a #CamelIMAPXListResponse, or %NULL
+ * Returns: a #CamelIMAPXListResponse, or %NULL on error
  *
  * Since: 3.10
  **/
diff --git a/src/camel/providers/imapx/camel-imapx-namespace-response.c 
b/src/camel/providers/imapx/camel-imapx-namespace-response.c
index 0038e6a95..ee622a1b5 100644
--- a/src/camel/providers/imapx/camel-imapx-namespace-response.c
+++ b/src/camel/providers/imapx/camel-imapx-namespace-response.c
@@ -196,7 +196,7 @@ repeat:
  * successful, stores the response data in a new #CamelIMAPXNamespaceResponse.
  * If an error occurs, the function sets @error and returns %NULL.
  *
- * Returns: (nullable): a #CamelIMAPXNamespaceResponse, or %NULL
+ * Returns: a #CamelIMAPXNamespaceResponse, or %NULL on error
  *
  * Since: 3.12
  **/
diff --git a/src/camel/providers/imapx/camel-imapx-status-response.c 
b/src/camel/providers/imapx/camel-imapx-status-response.c
index c2b49df58..013033214 100644
--- a/src/camel/providers/imapx/camel-imapx-status-response.c
+++ b/src/camel/providers/imapx/camel-imapx-status-response.c
@@ -94,7 +94,7 @@ camel_imapx_status_response_init (CamelIMAPXStatusResponse *response)
  * stores the response data in a new #CamelIMAPXStatusResponse.  If an error
  * occurs, the function sets @error and returns %NULL.
  *
- * Returns: (nullable): a #CamelIMAPXStatusResponse, or %NULL
+ * Returns: a #CamelIMAPXStatusResponse, or %NULL on error
  *
  * Since: 3.10
  **/
diff --git a/src/camel/providers/imapx/camel-imapx-utils.c b/src/camel/providers/imapx/camel-imapx-utils.c
index 86f3bf123..2ea4d6241 100644
--- a/src/camel/providers/imapx/camel-imapx-utils.c
+++ b/src/camel/providers/imapx/camel-imapx-utils.c
@@ -2947,7 +2947,7 @@ exit:
  *
  * If an error occurs, the function sets @error and returns %NULL.
  *
- * Returns: (nullable): a newly-allocated mailbox name, or %NULL
+ * Returns: a newly-allocated mailbox name, or %NULL on error
  *
  * Since: 3.10
  **/
diff --git a/src/camel/providers/pop3/camel-pop3-engine.c b/src/camel/providers/pop3/camel-pop3-engine.c
index 3ae140440..54d27b43e 100644
--- a/src/camel/providers/pop3/camel-pop3-engine.c
+++ b/src/camel/providers/pop3/camel-pop3-engine.c
@@ -125,10 +125,7 @@ read_greeting (CamelPOP3Engine *pe,
  * @cancellable: optional #GCancellable object, or %NULL
  * @error: optional #GError, or %NULL
  *
- * Returns a NULL stream.  A null stream is always at eof, and
- * always returns success for all reads and writes.
- *
- * Returns: (nullable): the stream
+ * Returns: (transfer full): a new #CamelPOP3Engine, or %NULL on error
  **/
 CamelPOP3Engine *
 camel_pop3_engine_new (CamelStream *source,
diff --git a/src/camel/providers/pop3/camel-pop3-store.c b/src/camel/providers/pop3/camel-pop3-store.c
index 2e6fa8876..8aebee58a 100644
--- a/src/camel/providers/pop3/camel-pop3-store.c
+++ b/src/camel/providers/pop3/camel-pop3-store.c
@@ -1159,7 +1159,7 @@ camel_pop3_store_expunge (CamelPOP3Store *store,
  * The returned #CamelStream is referenced for thread-safety and must be
  * unreferenced when finished with it.
  *
- * Returns: (nullable): a #CamelStream, or %NULL
+ * Returns: a #CamelStream, or %NULL on error
  **/
 CamelStream *
 camel_pop3_store_cache_add (CamelPOP3Store *store,
diff --git a/src/libebackend/e-server-side-source.c b/src/libebackend/e-server-side-source.c
index f0baf674a..e71cb24c8 100644
--- a/src/libebackend/e-server-side-source.c
+++ b/src/libebackend/e-server-side-source.c
@@ -1941,7 +1941,7 @@ e_server_side_source_new (ESourceRegistryServer *server,
  * function sets @error and returns %NULL.  Although at this time there
  * are no known error conditions for memory-only data sources.
  *
- * Returns: (nullable): a new memory-only #EServerSideSource, or %NULL
+ * Returns: a new memory-only #EServerSideSource, or %NULL on error
  *
  * Since: 3.6
  **/
diff --git a/src/libedataserver/e-collator.c b/src/libedataserver/e-collator.c
index 06f4e9c42..180f7840e 100644
--- a/src/libedataserver/e-collator.c
+++ b/src/libedataserver/e-collator.c
@@ -463,7 +463,7 @@ e_collator_unref (ECollator *collator)
  *
  * This function will first ensure that @str is valid UTF-8 encoded.
  *
- * Returns: (transfer full) (nullable): A collation key for @str, or
+ * Returns: (transfer full): A collation key for @str, or
  *    %NULL on failure with @error set.
  *
  * Since: 3.12
diff --git a/src/libedataserver/e-soup-session.c b/src/libedataserver/e-soup-session.c
index 13e0327f3..381b9f88d 100644
--- a/src/libedataserver/e-soup-session.c
+++ b/src/libedataserver/e-soup-session.c
@@ -798,7 +798,7 @@ e_soup_session_preset_request (SoupRequestHTTP *request)
  *
  * See also e_soup_session_new_request_uri().
  *
- * Returns: (transfer full) (nullable): a new #SoupRequestHTTP, or %NULL on error
+ * Returns: (transfer full): a new #SoupRequestHTTP, or %NULL on error
  *
  * Since: 3.26
  **/
diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c
index a639082d6..837e940f3 100644
--- a/src/libedataserver/e-source-registry.c
+++ b/src/libedataserver/e-source-registry.c
@@ -1792,7 +1792,7 @@ e_source_registry_init (ESourceRegistry *registry)
  * Since 3.12 a singleton will be returned.  No strong reference is kept
  * internally, so it is the caller's responsibility to keep one.
  *
- * Returns: (nullable): a new #ESourceRegistry, or %NULL
+ * Returns: a new #ESourceRegistry, or %NULL on error
  *
  * Since: 3.6
  **/
@@ -1886,7 +1886,7 @@ e_source_registry_new (GCancellable *cancellable,
  * If an error occurs in connecting to the D-Bus service, the function
  * sets @error and returns %NULL.
  *
- * Returns: (nullable): a new #ESourceRegistry, or %NULL
+ * Returns: a new #ESourceRegistry, or %NULL on error
  *
  * Since: 3.6
  **/
diff --git a/src/libedataserver/e-source.c b/src/libedataserver/e-source.c
index 8943ad346..b2fb6102d 100644
--- a/src/libedataserver/e-source.c
+++ b/src/libedataserver/e-source.c
@@ -2538,7 +2538,7 @@ __e_source_private_replace_dbus_object (ESource *source,
  *
  * FIXME: Elaborate on scratch sources.
  *
- * Returns: (nullable): a new #ESource, or %NULL on error
+ * Returns: a new #ESource, or %NULL on error
  *
  * Since: 3.6
  **/
@@ -2569,7 +2569,7 @@ e_source_new (GDBusObject *dbus_object,
  * or else from the thread-default #GMainContext at the time this function is
  * called.
  *
- * Returns: (nullable): a new scratch #ESource, or %NULL on error
+ * Returns: a new scratch #ESource, or %NULL on error
  *
  * Since: 3.6
  **/
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]