[evolution-data-server] Camel: Stop using allow-none annotation
- From: Corentin Noël <corentinnoel src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Camel: Stop using allow-none annotation
- Date: Sat, 5 Jun 2021 18:33:24 +0000 (UTC)
commit c3eb2c82bc5c1b9dca3458b85e8321503ae91284
Author: Corentin Noël <corentin elementary io>
Date: Sat Jun 5 17:48:09 2021 +0200
Camel: Stop using allow-none annotation
Replace it with nullable when needed
src/camel/camel-db.c | 2 +-
src/camel/camel-filter-search.c | 4 ++--
src/camel/camel-store.c | 2 +-
src/camel/camel.c | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/camel/camel-db.c b/src/camel/camel-db.c
index 702464b9e..db47c7868 100644
--- a/src/camel/camel-db.c
+++ b/src/camel/camel-db.c
@@ -2885,7 +2885,7 @@ get_number_cb (gpointer data,
/**
* camel_db_maybe_run_maintenance:
* @cdb: a #CamelDB
- * @error: (allow-none): a #GError or %NULL
+ * @error: a #GError or %NULL
*
* Runs a @cdb maintenance, which includes vacuum, if necessary.
*
diff --git a/src/camel/camel-filter-search.c b/src/camel/camel-filter-search.c
index ec3ab840d..c9854bebc 100644
--- a/src/camel/camel-filter-search.c
+++ b/src/camel/camel-filter-search.c
@@ -1334,7 +1334,7 @@ camel_search_result_to_string (gint value)
* @folder: in which folder the message is stored
* @expression:
* @logfile: (nullable): an optional log file to write logging information to, or %NULL
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: a #GCancellable, or %NULL
* @error: return location for a #GError, or %NULL
*
* Returns: one of CAMEL_SEARCH_MATCHED, CAMEL_SEARCH_NOMATCH, or
@@ -1459,7 +1459,7 @@ camel_filter_search_match_with_log (CamelSession *session,
* @source:
* @folder: in which folder the message is stored
* @expression:
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: a #GCancellable, or %NULL
* @error: return location for a #GError, or %NULL
*
* Returns: one of CAMEL_SEARCH_MATCHED, CAMEL_SEARCH_NOMATCH, or
diff --git a/src/camel/camel-store.c b/src/camel/camel-store.c
index 844ac0517..85e89d946 100644
--- a/src/camel/camel-store.c
+++ b/src/camel/camel-store.c
@@ -3259,7 +3259,7 @@ camel_store_initial_setup_finish (CamelStore *store,
/**
* camel_store_maybe_run_db_maintenance:
* @store: a #CamelStore instance
- * @error: (allow-none): return location for a #GError, or %NULL
+ * @error: return location for a #GError, or %NULL
*
* Checks the state of the current CamelDB used for the @store and eventually
* runs maintenance routines on it.
diff --git a/src/camel/camel.c b/src/camel/camel.c
index 4f71f13f9..1d0421ab3 100644
--- a/src/camel/camel.c
+++ b/src/camel/camel.c
@@ -310,9 +310,9 @@ camel_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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]