GNOME.org
 

[gcr/wip/nielsdg/no-allow-none: 4/5] Don't use deprecated (allow-none) GIR annotation

commit a5cedfe278096c539bb2a875e64f13ca877d7999
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Mon Dec 23 10:33:27 2019 +0100

    Don't use deprecated (allow-none) GIR annotation
    
    It should be replaced with either `(optional)`, `(nullable)`, or in some
    cases both.

 gck/gck-attributes.c                  | 12 +++++-----
 gck/gck-enumerator.c                  | 10 ++++----
 gck/gck-module.c                      |  6 ++---
 gck/gck-modules.c                     |  6 ++---
 gck/gck-object-cache.c                |  4 ++--
 gck/gck-session.c                     | 44 +++++++++++++++++------------------
 gcr/gcr-certificate-chain.c           |  4 ++--
 gcr/gcr-certificate.c                 | 12 +++++-----
 gcr/gcr-comparable.c                  |  2 +-
 gcr/gcr-filter-collection.c           |  4 ++--
 gcr/gcr-fingerprint.c                 |  8 +++----
 gcr/gcr-gnupg-collection.c            |  2 +-
 gcr/gcr-gnupg-importer.c              |  2 +-
 gcr/gcr-gnupg-key.c                   |  6 ++---
 gcr/gcr-gnupg-process.c               |  8 +++----
 gcr/gcr-importer.c                    |  2 +-
 gcr/gcr-library.c                     |  8 +++----
 gcr/gcr-parser.c                      | 20 ++++++++--------
 gcr/gcr-prompt.c                      |  4 ++--
 gcr/gcr-secret-exchange.c             |  6 ++---
 gcr/gcr-secure-memory.c               | 10 ++++----
 gcr/gcr-system-prompt.c               |  4 ++--
 ui/gcr-certificate-renderer.c         |  8 +++----
 ui/gcr-certificate-request-renderer.c |  6 ++---
 ui/gcr-certificate-widget.c           | 10 ++++----
 ui/gcr-collection-model.c             |  2 +-
 ui/gcr-combo-selector.c               |  2 +-
 ui/gcr-failure-renderer.c             |  2 +-
 ui/gcr-import-button.c                |  2 +-
 ui/gcr-key-renderer.c                 |  8 +++----
 ui/gcr-key-widget.c                   |  6 ++---
 ui/gcr-live-search.c                  |  2 +-
 ui/gcr-renderer.c                     |  8 +++----
 ui/gcr-viewer-widget.c                |  6 ++---
 ui/gcr-viewer.c                       |  2 +-
 35 files changed, 124 insertions(+), 124 deletions(-)
---
diff --git a/gck/gck-attributes.c b/gck/gck-attributes.c
index bb57ffe..b2fc9af 100644
--- a/gck/gck-attributes.c
+++ b/gck/gck-attributes.c
@@ -425,7 +425,7 @@ gck_builder_copy (GckBuilder *builder)
  * gck_builder_take_data:
  * @builder: the builder
  * @attr_type: the new attribute type
- * @value: (transfer full) (array length=length) (allow-none): the new
+ * @value: (transfer full) (array length=length) (nullable): the new
  *         attribute memory
  * @length: the length of the memory
  *
@@ -474,7 +474,7 @@ gck_builder_take_data (GckBuilder *builder,
  * gck_builder_add_data:
  * @builder: the builder
  * @attr_type: the new attribute type
- * @value: (array length=length) (allow-none): the new attribute memory
+ * @value: (array length=length) (nullable): the new attribute memory
  * @length: the length of the memory
  *
  * Add a new attribute to the builder with an arbitrary value. Unconditionally
@@ -515,7 +515,7 @@ gck_builder_add_data (GckBuilder *builder,
  * gck_builder_set_data:
  * @builder: the builder
  * @attr_type: the attribute type
- * @value: (array length=length) (allow-none): the new attribute memory
+ * @value: (array length=length) (nullable): the new attribute memory
  * @length: the length of the memory
  *
  * Set a new attribute to the builder with an arbitrary value. If an attribute
@@ -776,7 +776,7 @@ gck_builder_set_date (GckBuilder *builder,
  * gck_builder_add_string:
  * @builder: the builder
  * @attr_type: the new attribute type
- * @value: (allow-none): the attribute value
+ * @value: (nullable): the attribute value
  *
  * Add a new attribute to the builder for the string @value or %NULL.
  * Unconditionally adds a new attribute, even if one with the same @attr_type
@@ -1458,7 +1458,7 @@ gck_attribute_get_ulong (const GckAttribute *attr)
  * to this function unless you're know it's supposed to contain
  * a value of the right type.
  *
- * Return value: (allow-none): a null terminated string, to be freed with
+ * Return value: (nullable): a null terminated string, to be freed with
  *               g_free(), or %NULL if the value was invalid
  */
 gchar*
@@ -2320,7 +2320,7 @@ gck_attributes_ref_sink (GckAttributes *attrs)
 
 /**
  * gck_attributes_unref:
- * @attrs: (allow-none) (type Gck.Attributes): An attribute array
+ * @attrs: (nullable) (type Gck.Attributes): An attribute array
  *
  * Unreference this attribute array.
  *
diff --git a/gck/gck-enumerator.c b/gck/gck-enumerator.c
index 3921822..f35a191 100644
--- a/gck/gck-enumerator.c
+++ b/gck/gck-enumerator.c
@@ -918,7 +918,7 @@ gck_enumerator_set_object_type_full (GckEnumerator *self,
  * Get the enumerator that will be run after all objects from this one
  * are seen.
  *
- * Returns: (transfer full) (allow-none): the chained enumerator or %NULL
+ * Returns: (transfer full) (nullable): the chained enumerator or %NULL
  */
 GckEnumerator *
 gck_enumerator_get_chained (GckEnumerator *self)
@@ -940,7 +940,7 @@ gck_enumerator_get_chained (GckEnumerator *self)
 /**
  * gck_enumerator_set_chained:
  * @self: the enumerator
- * @chained: (allow-none): the chained enumerator or %NULL
+ * @chained: (nullable): the chained enumerator or %NULL
  *
  * Set a chained enumerator that will be run after all objects from this one
  * are seen.
@@ -975,7 +975,7 @@ gck_enumerator_set_chained (GckEnumerator *self,
  *
  * Get the interaction used when a pin is needed
  *
- * Returns: (transfer full) (allow-none): the interaction or %NULL
+ * Returns: (transfer full) (nullable): the interaction or %NULL
  */
 GTlsInteraction *
 gck_enumerator_get_interaction (GckEnumerator *self)
@@ -997,7 +997,7 @@ gck_enumerator_get_interaction (GckEnumerator *self)
 /**
  * gck_enumerator_set_interaction:
  * @self: the enumerator
- * @interaction: (allow-none): the interaction or %NULL
+ * @interaction: (nullable): the interaction or %NULL
  *
  * Set the interaction used when a pin is needed
  */
@@ -1181,7 +1181,7 @@ extract_results (GckEnumeratorState *state,
  * %NULL is also returned if the function fails. Use the @error to determine
  * whether a failure occurred or not.
  *
- * Returns: (transfer full) (allow-none): The next object, which must be released
+ * Returns: (transfer full) (nullable): The next object, which must be released
  * using g_object_unref, or %NULL.
  */
 GckObject *
diff --git a/gck/gck-module.c b/gck/gck-module.c
index f50200b..9e381b1 100644
--- a/gck/gck-module.c
+++ b/gck/gck-module.c
@@ -376,7 +376,7 @@ free_initialize (Initialize *args)
 /**
  * gck_module_initialize:
  * @path: The file system path to the PKCS\#11 module to load.
- * @cancellable: (allow-none): optional cancellation object
+ * @cancellable: (nullable): optional cancellation object
  * @error: A location to store an error resulting from a failed load.
  *
  * Load and initialize a PKCS\#11 module represented by a GckModule object.
@@ -413,7 +413,7 @@ gck_module_initialize (const gchar *path,
 /**
  * gck_module_initialize_async:
  * @path: the file system path to the PKCS\#11 module to load
- * @cancellable: (allow-none): optional cancellation object
+ * @cancellable: (nullable): optional cancellation object
  * @callback: a callback which will be called when the operation completes
  * @user_data: data to pass to the callback
  *
@@ -444,7 +444,7 @@ gck_module_initialize_async (const gchar *path,
  *
  * Finishes the asynchronous initialize operation.
  *
- * Returns: (transfer full) (allow-none): The initialized module, or NULL
+ * Returns: (transfer full) (nullable): The initialized module, or NULL
  */
 GckModule *
 gck_module_initialize_finish (GAsyncResult *result,
diff --git a/gck/gck-modules.c b/gck/gck-modules.c
index 57530ab..766da57 100644
--- a/gck/gck-modules.c
+++ b/gck/gck-modules.c
@@ -82,8 +82,8 @@ free_initialize_registered (InitializeRegistered *args)
 
 /**
  * gck_modules_initialize_registered:
- * @cancellable: (allow-none): optional cancellation object
- * @error: (allow-none): location to place an error on failure
+ * @cancellable: (nullable): optional cancellation object
+ * @error: (out) (optional): location to place an error on failure
  *
  * Load and initialize all the registered modules.
  *
@@ -333,7 +333,7 @@ gck_modules_tokens_for_uri (GList *modules,
  * This call can block. Use gck_modules_enumerate_uri() for a non-blocking
  * version.
  *
- * Returns: (transfer full) (allow-none): A new #GckObject which should be released with
+ * Returns: (transfer full) (nullable): A new #GckObject which should be released with
  * g_object_unref(), or %NULL if no matching object was found.
  */
 GckObject*
diff --git a/gck/gck-object-cache.c b/gck/gck-object-cache.c
index 8da15cb..e6f93e7 100644
--- a/gck/gck-object-cache.c
+++ b/gck/gck-object-cache.c
@@ -88,7 +88,7 @@ gck_object_cache_default_init (GckObjectCacheIface *iface)
  *
  * Gets the attributes cached on this object.
  *
- * Returns: (transfer full) (allow-none): the attributes
+ * Returns: (transfer full) (nullable): the attributes
  */
 GckAttributes *
 gck_object_cache_get_attributes (GckObjectCache *object)
@@ -102,7 +102,7 @@ gck_object_cache_get_attributes (GckObjectCache *object)
 /**
  * gck_object_cache_set_attributes:
  * @object: an object with an attribute cache
- * @attrs: (allow-none): the attributes to set
+ * @attrs: (nullable): the attributes to set
  *
  * Sets the attributes cached on this object.
  *
diff --git a/gck/gck-session.c b/gck/gck-session.c
index 433498c..a55dfaf 100644
--- a/gck/gck-session.c
+++ b/gck/gck-session.c
@@ -769,7 +769,7 @@ gck_session_get_options (GckSession *self)
  * Get the interaction object set on this session, which is used to prompt
  * for pins and the like.
  *
- * Returns: (transfer full) (allow-none): the interaction object, or %NULL
+ * Returns: (transfer full) (nullable): the interaction object, or %NULL
  */
 GTlsInteraction *
 gck_session_get_interaction (GckSession *self)
@@ -785,7 +785,7 @@ gck_session_get_interaction (GckSession *self)
 /**
  * gck_session_set_interaction:
  * @self: the session
- * @interaction: (allow-none): the interaction or %NULL
+ * @interaction: (nullable): the interaction or %NULL
  *
  * Set the interaction object on this session, which is used to prompt for
  * pins and the like.
@@ -816,7 +816,7 @@ gck_session_set_interaction (GckSession *self,
  * gck_session_open:
  * @slot: the slot to open session on
  * @options: session options
- * @interaction: (allow-none): optional interaction for logins or object authentication
+ * @interaction: (nullable): optional interaction for logins or object authentication
  * @cancellable: optional cancellation object
  * @error: location to place error or %NULL
  *
@@ -842,7 +842,7 @@ gck_session_open (GckSlot *slot,
  * gck_session_open_async:
  * @slot: the slot to open session on
  * @options: session options
- * @interaction: (allow-none): optional interaction for logins or object authentication
+ * @interaction: (nullable): optional interaction for logins or object authentication
  * @cancellable: optional cancellation object
  * @callback: called when the operation completes
  * @user_data: data to pass to callback
@@ -917,7 +917,7 @@ perform_init_pin (InitPin *args)
 /**
  * gck_session_init_pin:
  * @self: Initialize PIN for this session's slot.
- * @pin: (allow-none) (array length=n_pin): the user's PIN, or %NULL for
+ * @pin: (nullable) (array length=n_pin): the user's PIN, or %NULL for
  *       protected authentication path
  * @n_pin: the length of the PIN
  * @cancellable: Optional cancellation object, or NULL.
@@ -943,7 +943,7 @@ gck_session_init_pin (GckSession *self, const guchar *pin, gsize n_pin,
 /**
  * gck_session_init_pin_async:
  * @self: Initialize PIN for this session's slot.
- * @pin: (allow-none) (array length=n_pin): the user's PIN, or %NULL for protected authentication path
+ * @pin: (nullable) (array length=n_pin): the user's PIN, or %NULL for protected authentication path
  * @n_pin: the length of the PIN
  * @cancellable: Optional cancellation object, or NULL.
  * @callback: Called when the operation completes.
@@ -1015,10 +1015,10 @@ perform_set_pin (SetPin *args)
 /**
  * gck_session_set_pin:
  * @self: Change the PIN for this session's slot.
- * @old_pin: (allow-none) (array length=n_old_pin): the user's old PIN, or %NULL
+ * @old_pin: (nullable) (array length=n_old_pin): the user's old PIN, or %NULL
  *           for protected authentication path.
  * @n_old_pin: The length of the PIN.
- * @new_pin: (allow-none) (array length=n_new_pin): the user's new PIN, or %NULL
+ * @new_pin: (nullable) (array length=n_new_pin): the user's new PIN, or %NULL
  *           for protected authentication path
  * @n_new_pin: The length of the PIN.
  * @cancellable: Optional cancellation object, or NULL.
@@ -1042,10 +1042,10 @@ gck_session_set_pin (GckSession *self, const guchar *old_pin, gsize n_old_pin,
 /**
  * gck_session_set_pin_async:
  * @self: Change the PIN for this session's slot.
- * @old_pin: (allow-none) (array length=n_new_pin): the user's old PIN, or %NULL
+ * @old_pin: (nullable) (array length=n_new_pin): the user's old PIN, or %NULL
  *           for protected authentication path
  * @n_old_pin: the length of the old PIN
- * @new_pin: (allow-none) (array length=n_new_pin): the user's new PIN, or %NULL
+ * @new_pin: (nullable) (array length=n_new_pin): the user's new PIN, or %NULL
  *           for protected authentication path
  * @n_new_pin: the length of the new PIN
  * @cancellable: Optional cancellation object, or NULL.
@@ -1117,7 +1117,7 @@ perform_login (Login *args)
  * gck_session_login:
  * @self: Log in to this session.
  * @user_type: The type of login user.
- * @pin: (allow-none) (array length=n_pin): the user's PIN, or %NULL for
+ * @pin: (nullable) (array length=n_pin): the user's PIN, or %NULL for
  *       protected authentication path
  * @n_pin: The length of the PIN.
  * @cancellable: Optional cancellation object, or NULL.
@@ -1141,7 +1141,7 @@ gck_session_login (GckSession *self, gulong user_type, const guchar *pin,
  * gck_session_login_async:
  * @self: Log in to this session.
  * @user_type: The type of login user.
- * @pin: (allow-none) (array length=n_pin): the user's PIN, or %NULL for
+ * @pin: (nullable) (array length=n_pin): the user's PIN, or %NULL for
  *       protected authentication path
  * @n_pin: The length of the PIN.
  * @cancellable: Optional cancellation object, or NULL.
@@ -1208,7 +1208,7 @@ perform_interactive (Interactive *args)
  * gck_session_login_interactive:
  * @self: session to use for login
  * @user_type: the type of login user
- * @interaction: (allow-none): interaction to request PIN when necessary
+ * @interaction: (nullable): interaction to request PIN when necessary
  * @cancellable: optional cancellation object, or %NULL
  * @error: location to return an error
  *
@@ -1243,7 +1243,7 @@ gck_session_login_interactive (GckSession *self,
  * gck_session_login_interactive_async:
  * @self: session to use for login
  * @user_type: the type of login user
- * @interaction: (allow-none): interaction to request PIN when necessary
+ * @interaction: (nullable): interaction to request PIN when necessary
  * @cancellable: optional cancellation object, or %NULL
  * @callback: called when the operation completes
  * @user_data: data to pass to the callback
@@ -1573,7 +1573,7 @@ perform_find_objects (FindObjects *args)
  *
  * If the @match #GckAttributes is floating, it is consumed.
  *
- * Returns: (transfer full) (array length=n_handles) (allow-none): a list of
+ * Returns: (transfer full) (array length=n_handles) (nullable): a list of
  *          the matching objects, which may be empty
  **/
 gulong *
@@ -1645,7 +1645,7 @@ gck_session_find_handles_async (GckSession *self,
  *
  * Get the result of a find handles operation.
  *
- * Returns: (transfer full) (array length=n_handles) (allow-none): an array of
+ * Returns: (transfer full) (array length=n_handles) (nullable): an array of
  *          handles that matched, which may be empty, or %NULL on failure
  **/
 gulong *
@@ -1843,8 +1843,8 @@ perform_generate_key_pair (GenerateKeyPair *args)
  * @mech_type: The mechanism type to use for key generation.
  * @public_attrs: Additional attributes for the generated public key.
  * @private_attrs: Additional attributes for the generated private key.
- * @public_key: (allow-none) (out): location to return the resulting public key
- * @private_key: (allow-none) (out): location to return the resulting private key.
+ * @public_key: (optional) (out): location to return the resulting public key
+ * @private_key: (optional) (out): location to return the resulting private key.
  * @cancellable: Optional cancellation object, or NULL.
  * @error: A location to return an error, or NULL.
  *
@@ -1872,8 +1872,8 @@ gck_session_generate_key_pair (GckSession *self, gulong mech_type,
  * @mechanism: The mechanism to use for key generation.
  * @public_attrs: Additional attributes for the generated public key.
  * @private_attrs: Additional attributes for the generated private key.
- * @public_key: (allow-none) (out): a location to return the resulting public key
- * @private_key: (allow-none) (out): a location to return the resulting private key
+ * @public_key: (optional) (out): a location to return the resulting public key
+ * @private_key: (optional) (out): a location to return the resulting private key
  * @cancellable: Optional cancellation object, or NULL.
  * @error: A location to return an error, or NULL.
  *
@@ -1967,8 +1967,8 @@ gck_session_generate_key_pair_async (GckSession *self, GckMechanism *mechanism,
  * gck_session_generate_key_pair_finish:
  * @self: The session to use.
  * @result: The async result passed to the callback.
- * @public_key: (allow-none) (out): a location to return the resulting public key
- * @private_key: (allow-none) (out): a location to return the resulting private key
+ * @public_key: (optional) (out): a location to return the resulting public key
+ * @private_key: (optional) (out): a location to return the resulting private key
  * @error: A location to return an error.
  *
  * Get the result of a generate key pair operation.
diff --git a/gcr/gcr-certificate-chain.c b/gcr/gcr-certificate-chain.c
index b0d2d31..72428da 100644
--- a/gcr/gcr-certificate-chain.c
+++ b/gcr/gcr-certificate-chain.c
@@ -665,7 +665,7 @@ gcr_certificate_chain_get_certificate (GcrCertificateChain *self, guint index)
  * gcr_certificate_chain_build:
  * @self: the #GcrCertificateChain
  * @purpose: the purpose the certificate chain will be used for
- * @peer: (allow-none): the peer the certificate chain will be used with, or %NULL
+ * @peer: (nullable): the peer the certificate chain will be used with, or %NULL
  * @flags: chain completion flags
  * @cancellable: a #GCancellable or %NULL
  * @error: a #GError or %NULL
@@ -736,7 +736,7 @@ gcr_certificate_chain_build (GcrCertificateChain *self,
  * gcr_certificate_chain_build_async:
  * @self: the #GcrCertificateChain
  * @purpose: the purpose the certificate chain will be used for
- * @peer: (allow-none): the peer the certificate chain will be used with, or %NULL
+ * @peer: (nullable): the peer the certificate chain will be used with, or %NULL
  * @flags: chain completion flags
  * @cancellable: a #GCancellable or %NULL
  * @callback: this will be called when the operation completes.
diff --git a/gcr/gcr-certificate.c b/gcr/gcr-certificate.c
index 07d7572..d44475d 100644
--- a/gcr/gcr-certificate.c
+++ b/gcr/gcr-certificate.c
@@ -363,8 +363,8 @@ gcr_certificate_get_columns (void)
 
 /**
  * gcr_certificate_compare:
- * @first: (allow-none): the certificate to compare
- * @other: (allow-none): the certificate to compare against
+ * @first: (nullable): the certificate to compare
+ * @other: (nullable): the certificate to compare against
  *
  * Compare one certificate against another. If the certificates are equal
  * then zero is returned. If one certificate is %NULL or not a certificate,
@@ -475,7 +475,7 @@ gcr_certificate_get_issuer_cn (GcrCertificate *self)
  * The string returned should be freed by the caller when no longer
  * required.
  *
- * Returns: (allow-none): the allocated part of the issuer DN, or %NULL if no
+ * Returns: (nullable): the allocated part of the issuer DN, or %NULL if no
  *          such part is present
  */
 gchar *
@@ -660,7 +660,7 @@ gcr_certificate_get_subject_name (GcrCertificate *self)
  * The string returned should be freed by the caller when no longer
  * required.
  *
- * Returns: (allow-none): the allocated part of the subject DN, or %NULL if no
+ * Returns: (nullable): the allocated part of the subject DN, or %NULL if no
  *          such part is present.
  */
 gchar*
@@ -1005,8 +1005,8 @@ gcr_certificate_get_icon (GcrCertificate *self)
 /**
  * gcr_certificate_get_basic_constraints:
  * @self: the certificate
- * @is_ca: (out) (allow-none): location to place a %TRUE if is an authority
- * @path_len: (out) (allow-none): location to place the max path length
+ * @is_ca: (out) (optional): location to place a %TRUE if is an authority
+ * @path_len: (out) (optional): location to place the max path length
  *
  * Get the basic constraints for the certificate if present. If %FALSE is
  * returned then no basic constraints are present and the @is_ca and
diff --git a/gcr/gcr-comparable.c b/gcr/gcr-comparable.c
index 5c4304d..e2de7e0 100644
--- a/gcr/gcr-comparable.c
+++ b/gcr/gcr-comparable.c
@@ -59,7 +59,7 @@ gcr_comparable_default_init (GcrComparableIface *iface)
 /**
  * gcr_comparable_compare:
  * @self: The comparable object
- * @other: (allow-none): Another comparable object
+ * @other: (nullable): Another comparable object
  *
  * Compare whether two objects represent the same thing. The return value can
  * also be used to sort the objects.
diff --git a/gcr/gcr-filter-collection.c b/gcr/gcr-filter-collection.c
index 769c0f6..c82ec83 100644
--- a/gcr/gcr-filter-collection.c
+++ b/gcr/gcr-filter-collection.c
@@ -252,7 +252,7 @@ gcr_filter_collection_iface (GcrCollectionIface *iface)
 /**
  * gcr_filter_collection_new_with_callback:
  * @underlying: the underlying collection
- * @callback: (allow-none): function to call for each object
+ * @callback: (nullable): function to call for each object
  * @user_data: data to pass to the callback
  * @destroy_func: called for user_data when it is no longer needed
  *
@@ -287,7 +287,7 @@ gcr_filter_collection_new_with_callback (GcrCollection *underlying,
 /**
  * gcr_filter_collection_set_callback:
  * @self: a filter collection
- * @callback: (allow-none): function to call for each object
+ * @callback: (nullable): function to call for each object
  * @user_data: data to pass to the callback
  * @destroy_func: called for user_data when it is no longer needed
  *
diff --git a/gcr/gcr-fingerprint.c b/gcr/gcr-fingerprint.c
index 445f88a..235cdf7 100644
--- a/gcr/gcr-fingerprint.c
+++ b/gcr/gcr-fingerprint.c
@@ -52,11 +52,11 @@
  * @key_info: (array length=n_key_info): DER encoded subjectPublicKeyInfo structure
  * @n_key_info: length of DER encoded structure
  * @checksum_type: the type of fingerprint to create
- * @n_fingerprint: the length of fingerprint returned
+ * @n_fingerprint: (out): the length of fingerprint returned
  *
  * Create a key fingerprint for a DER encoded subjectPublicKeyInfo.
  *
- * Returns: (transfer full) (allow-none) (array length=n_fingerprint): the
+ * Returns: (transfer full) (nullable) (array length=n_fingerprint): the
  *          fingerprint or %NULL if the input was invalid.
  */
 guchar *
@@ -89,13 +89,13 @@ gcr_fingerprint_from_subject_public_key_info (const guchar *key_info,
  * gcr_fingerprint_from_attributes:
  * @attrs: attributes for key or certificate
  * @checksum_type: the type of fingerprint to create
- * @n_fingerprint: the length of fingerprint returned
+ * @n_fingerprint: (out): the length of fingerprint returned
  *
  * Create a key fingerprint for a certificate, public key or private key.
  * Note that this is not a fingerprint of certificate data, which you would
  * use gcr_certificate_get_fingerprint() for.
  *
- * Returns: (transfer full) (allow-none) (array length=n_fingerprint): the
+ * Returns: (transfer full) (nullable) (array length=n_fingerprint): the
  *          fingerprint or %NULL if the input was invalid.
  */
 guchar *
diff --git a/gcr/gcr-gnupg-collection.c b/gcr/gcr-gnupg-collection.c
index 5b25615..c47ead8 100644
--- a/gcr/gcr-gnupg-collection.c
+++ b/gcr/gcr-gnupg-collection.c
@@ -189,7 +189,7 @@ _gcr_collection_iface (GcrCollectionIface *iface)
 
 /**
  * _gcr_gnupg_collection_new:
- * @directory: (allow-none): The gnupg home directory.
+ * @directory: (nullable): The gnupg home directory.
  *
  * Create a new GcrGnupgCollection.
  *
diff --git a/gcr/gcr-gnupg-importer.c b/gcr/gcr-gnupg-importer.c
index 9eaad91..9abfd48 100644
--- a/gcr/gcr-gnupg-importer.c
+++ b/gcr/gcr-gnupg-importer.c
@@ -361,7 +361,7 @@ gcr_gnupg_importer_iface (GcrImporterIface *iface)
 
 /**
  * _gcr_gnupg_importer_new:
- * @directory: (allow-none): the directory to import to, or %NULL for default
+ * @directory: (nullable): the directory to import to, or %NULL for default
  *
  * Create a new #GcrGnupgImporter.
  *
diff --git a/gcr/gcr-gnupg-key.c b/gcr/gcr-gnupg-key.c
index c6e9e48..55836fc 100644
--- a/gcr/gcr-gnupg-key.c
+++ b/gcr/gcr-gnupg-key.c
@@ -245,7 +245,7 @@ _gcr_gnupg_key_class_init (GcrGnupgKeyClass *klass)
 /**
  * _gcr_gnupg_key_new:
  * @pubset: array of GcrRecord* representing public part of key
- * @secset: (allow-none): array of GcrRecord* representing secret part of key.
+ * @secset: (nullable): array of GcrRecord* representing secret part of key.
  *
  * Create a new GcrGnupgKey for the record data passed. If the secret part
  * of the key is set, then this represents a secret key; otherwise it represents
@@ -325,7 +325,7 @@ _gcr_gnupg_key_set_public_records (GcrGnupgKey *self, GPtrArray *records)
  *
  * Get the record secret data this key is based on. %NULL if a public key.
  *
- * Returns: (transfer none) (allow-none): An array of GcrColons*.
+ * Returns: (transfer none) (nullable): An array of GcrColons*.
  */
 GPtrArray*
 _gcr_gnupg_key_get_secret_records (GcrGnupgKey *self)
@@ -337,7 +337,7 @@ _gcr_gnupg_key_get_secret_records (GcrGnupgKey *self)
 /**
  * _gcr_gnupg_key_set_secret_records:
  * @self: The key
- * @records: (allow-none): The new array of GcrRecord*
+ * @records: (nullable): The new array of GcrRecord*
  *
  * Set the secret data for this key. %NULL if public key.
  */
diff --git a/gcr/gcr-gnupg-process.c b/gcr/gcr-gnupg-process.c
index b3ff444..a90281b 100644
--- a/gcr/gcr-gnupg-process.c
+++ b/gcr/gcr-gnupg-process.c
@@ -317,8 +317,8 @@ _gcr_gnupg_process_init_async (GAsyncResultIface *iface)
 
 /**
  * _gcr_gnupg_process_new:
- * @directory: (allow-none): The gnupg home directory
- * @executable: (allow-none): The gpg executable
+ * @directory: (nullable): The gnupg home directory
+ * @executable: (nullable): The gpg executable
  *
  * Create a new GcrGnupgProcess.
  *
@@ -934,9 +934,9 @@ on_cancellable_cancelled (GCancellable *cancellable, gpointer user_data)
  * _gcr_gnupg_process_run_async:
  * @self: The process
  * @argv: (array zero-terminated=1): The arguments for the process, not including executable, terminated 
with %NULL.
- * @envp: (allow-none) (array zero-terminated=1): The environment for new process, terminated with %NULL.
+ * @envp: (nullable) (array zero-terminated=1): The environment for new process, terminated with %NULL.
  * @flags: Flags for starting the process.
- * @cancellable: (allow-none): Cancellation object
+ * @cancellable: (nullable): Cancellation object
  * @callback: Will be called when operation completes.
  * @user_data: (closure): Data passed to callback.
  *
diff --git a/gcr/gcr-importer.c b/gcr/gcr-importer.c
index ef029e1..5943405 100644
--- a/gcr/gcr-importer.c
+++ b/gcr/gcr-importer.c
@@ -505,7 +505,7 @@ gcr_importer_import_finish (GcrImporter *importer,
  * Get the interaction used to prompt the user when needed by this
  * importer.
  *
- * Returns: (transfer none) (allow-none): the interaction or %NULL
+ * Returns: (transfer none) (nullable): the interaction or %NULL
  */
 GTlsInteraction *
 gcr_importer_get_interaction (GcrImporter *importer)
diff --git a/gcr/gcr-library.c b/gcr/gcr-library.c
index 7b896fb..df9e807 100644
--- a/gcr/gcr-library.c
+++ b/gcr/gcr-library.c
@@ -571,7 +571,7 @@ gcr_pkcs11_get_trust_lookup_slots (void)
  * Get the PKCS\#11 URI that is used to identify which slot to use for
  * storing trust storage.
  *
- * Returns: (allow-none): the uri which identifies trust storage slot
+ * Returns: (nullable): the uri which identifies trust storage slot
  */
 const gchar*
 gcr_pkcs11_get_trust_store_uri (void)
@@ -582,7 +582,7 @@ gcr_pkcs11_get_trust_store_uri (void)
 
 /**
  * gcr_pkcs11_set_trust_store_uri:
- * @pkcs11_uri: (allow-none): the uri which identifies trust storage slot
+ * @pkcs11_uri: (nullable): the uri which identifies trust storage slot
  *
  * Set the PKCS\#11 URI that is used to identify which slot to use for
  * storing trust assertions.
@@ -609,7 +609,7 @@ gcr_pkcs11_set_trust_store_uri (const gchar *pkcs11_uri)
  * Get the PKCS\#11 URIs that are used to identify which slots to use for
  * lookup trust assertions.
  *
- * Returns: (allow-none) (transfer none): the uri which identifies trust storage slot
+ * Returns: (nullable) (transfer none): the uri which identifies trust storage slot
  */
 const gchar **
 gcr_pkcs11_get_trust_lookup_uris (void)
@@ -620,7 +620,7 @@ gcr_pkcs11_get_trust_lookup_uris (void)
 
 /**
  * gcr_pkcs11_set_trust_lookup_uris:
- * @pkcs11_uris: (allow-none): the uris which identifies trust lookup slots
+ * @pkcs11_uris: (nullable): the uris which identifies trust lookup slots
  *
  * Set the PKCS\#11 URIs that are used to identify which slots to use for
  * lookup of trust assertions.
diff --git a/gcr/gcr-parser.c b/gcr/gcr-parser.c
index 11c5fbb..1e0ed32 100644
--- a/gcr/gcr-parser.c
+++ b/gcr/gcr-parser.c
@@ -2528,7 +2528,7 @@ gcr_parser_new (void)
 /**
  * gcr_parser_add_password:
  * @self: The parser
- * @password: (allow-none): a password to try
+ * @password: (nullable): a password to try
  *
  * Add a password to the set of passwords to try when parsing locked or encrypted
  * items. This is usually called from the #GcrParser::authenticate signal.
@@ -2771,7 +2771,7 @@ gcr_parser_get_filename (GcrParser *self)
 /**
  * gcr_parser_set_filename:
  * @self: a parser item
- * @filename: (allow-none): a string of the filename of the parser item
+ * @filename: (nullable): a string of the filename of the parser item
  *
  * Sets the filename of the parser item.
  */
@@ -2854,7 +2854,7 @@ gcr_parsed_unref (gpointer parsed)
  * Get a description for the type of the currently parsed item. This is generally
  * only valid during the #GcrParser::parsed signal.
  *
- * Returns: (allow-none): the description for the current item; this is owned by
+ * Returns: (nullable): the description for the current item; this is owned by
  *          the parser and should not be freed
  */
 const gchar*
@@ -2872,7 +2872,7 @@ gcr_parser_get_parsed_description (GcrParser *self)
  *
  * Get the descirption for a parsed item.
  *
- * Returns: (allow-none): the description
+ * Returns: (nullable): the description
  */
 const gchar*
 gcr_parsed_get_description (GcrParsed *parsed)
@@ -2893,7 +2893,7 @@ gcr_parsed_get_description (GcrParsed *parsed)
  * Get the attributes which make up the currently parsed item. This is generally
  * only valid during the #GcrParser::parsed signal.
  *
- * Returns: (transfer none) (allow-none): the attributes for the current item,
+ * Returns: (transfer none) (nullable): the attributes for the current item,
  *          which are owned by the parser and should not be freed
  */
 GckAttributes *
@@ -2911,7 +2911,7 @@ gcr_parser_get_parsed_attributes (GcrParser *self)
  *
  * Get the attributes which make up the parsed item.
  *
- * Returns: (transfer none) (allow-none): the attributes for the item; these
+ * Returns: (transfer none) (nullable): the attributes for the item; these
  *          are owned by the parsed item and should not be freed
  */
 GckAttributes *
@@ -2933,7 +2933,7 @@ gcr_parsed_get_attributes (GcrParsed *parsed)
  * Get the label of the currently parsed item. This is generally only valid
  * during the #GcrParser::parsed signal.
  *
- * Returns: (allow-none): the label of the currently parsed item. The value is
+ * Returns: (nullable): the label of the currently parsed item. The value is
  *          owned by the parser and should not be freed.
  */
 const gchar*
@@ -2951,7 +2951,7 @@ gcr_parser_get_parsed_label (GcrParser *self)
  *
  * Get the label for the parsed item.
  *
- * Returns: (allow-none): the label for the item
+ * Returns: (nullable): the label for the item
  */
 const gchar*
 gcr_parsed_get_label (GcrParsed *parsed)
@@ -2973,7 +2973,7 @@ gcr_parsed_get_label (GcrParsed *parsed)
  * Get the raw data block that represents this parsed object. This is only
  * valid during the #GcrParser::parsed signal.
  *
- * Returns: (transfer none) (array length=n_block) (allow-none): the raw data
+ * Returns: (transfer none) (array length=n_block) (nullable): the raw data
  *          block of the currently parsed item; the value is owned by the parser
  *          and should not be freed
  */
@@ -3011,7 +3011,7 @@ gcr_parser_get_parsed_bytes (GcrParser *self)
  *
  * Get the raw data block for the parsed item.
  *
- * Returns: (transfer none) (array length=n_data) (allow-none): the raw data of
+ * Returns: (transfer none) (array length=n_data) (nullable): the raw data of
  *          the parsed item, or %NULL
  */
 const guchar *
diff --git a/gcr/gcr-prompt.c b/gcr/gcr-prompt.c
index d1e71a4..6a34cba 100644
--- a/gcr/gcr-prompt.c
+++ b/gcr/gcr-prompt.c
@@ -480,7 +480,7 @@ gcr_prompt_get_warning (GcrPrompt *prompt)
 /**
  * gcr_prompt_set_warning:
  * @prompt: the prompt
- * @warning: (allow-none): the warning or %NULL
+ * @warning: (nullable): the warning or %NULL
  *
  * Set a prompt warning displayed on the prompt.
  *
@@ -520,7 +520,7 @@ gcr_prompt_get_choice_label (GcrPrompt *prompt)
 /**
  * gcr_prompt_set_choice_label:
  * @prompt: the prompt
- * @choice_label: (allow-none): the additional choice or %NULL
+ * @choice_label: (nullable): the additional choice or %NULL
  *
  * Set the label for the additional choice.
  *
diff --git a/gcr/gcr-secret-exchange.c b/gcr/gcr-secret-exchange.c
index 02380ca..505f0d8 100644
--- a/gcr/gcr-secret-exchange.c
+++ b/gcr/gcr-secret-exchange.c
@@ -218,7 +218,7 @@ gcr_secret_exchange_finalize (GObject *obj)
 
 /**
  * gcr_secret_exchange_new:
- * @protocol: (allow-none): the exchange protocol to use
+ * @protocol: (nullable): the exchange protocol to use
  *
  * Create a new secret exchange object.
  *
@@ -454,7 +454,7 @@ gcr_secret_exchange_receive (GcrSecretExchange *self,
 /**
  * gcr_secret_exchange_get_secret:
  * @self: a #GcrSecretExchange object
- * @secret_len: (allow-none): optionally, a location to store the length of returned secret
+ * @secret_len: (out) (optional): optionally, a location to store the length of returned secret
  *
  * Returns the last secret received. If no secret has yet been received this
  * will return %NULL. The string is owned by the #GcrSecretExchange object
@@ -508,7 +508,7 @@ perform_encrypt (GcrSecretExchange *self,
 /**
  * gcr_secret_exchange_send:
  * @self: a #GcrSecretExchange object
- * @secret: (allow-none): optionally, a secret to send to the other side
+ * @secret: (nullable): optionally, a secret to send to the other side
  * @secret_len: length of @secret, or -1 if null terminated
  *
  * Send a reply to the other side of the secret exchange, optionally sending a
diff --git a/gcr/gcr-secure-memory.c b/gcr/gcr-secure-memory.c
index c7651f5..201861a 100644
--- a/gcr/gcr-secure-memory.c
+++ b/gcr/gcr-secure-memory.c
@@ -103,7 +103,7 @@ gcr_secure_memory_try_alloc (gsize size)
 
 /**
  * gcr_secure_memory_realloc: (skip)
- * @memory: (allow-none): pointer to reallocate or %NULL to allocate a new block
+ * @memory: (nullable): pointer to reallocate or %NULL to allocate a new block
  * @size: new desired size of the memory block, or 0 to free the memory
  *
  * Reallocate a block of non-pageable memory.
@@ -144,7 +144,7 @@ gcr_secure_memory_realloc (gpointer memory,
 
 /**
  * gcr_secure_memory_try_realloc: (skip)
- * @memory: (allow-none): pointer to reallocate or %NULL to allocate a new block
+ * @memory: (nullable): pointer to reallocate or %NULL to allocate a new block
  * @size: new desired size of the memory block
  *
  * Reallocate a block of non-pageable memory.
@@ -184,7 +184,7 @@ gcr_secure_memory_try_realloc (gpointer memory,
 
 /**
  * gcr_secure_memory_free: (skip)
- * @memory: (allow-none): pointer to the beginning of the block of memory to free
+ * @memory: (nullable): pointer to the beginning of the block of memory to free
  *
  * Free a block of non-pageable memory.
  *
@@ -216,7 +216,7 @@ gcr_secure_memory_is_secure (gpointer memory)
 
 /**
  * gcr_secure_memory_strdup: (skip)
- * @string: (allow-none): null terminated string to copy
+ * @string: (nullable): null terminated string to copy
  *
  * Copy a string into non-pageable memory. If the input string is %NULL, then
  * %NULL will be returned.
@@ -232,7 +232,7 @@ gcr_secure_memory_strdup (const gchar* string)
 
 /**
  * gcr_secure_memory_strfree: (skip)
- * @string: (allow-none): null terminated string to fere
+ * @string: (nullable): null terminated string to fere
  *
  * Free a string, whether securely allocated using these functions or not.
  * This will also clear out the contents of the string so they do not
diff --git a/gcr/gcr-system-prompt.c b/gcr/gcr-system-prompt.c
index 08a4a4a..23e4148 100644
--- a/gcr/gcr-system-prompt.c
+++ b/gcr/gcr-system-prompt.c
@@ -1376,7 +1376,7 @@ gcr_system_prompt_open_async (gint timeout_seconds,
 
 /**
  * gcr_system_prompt_open_for_prompter_async:
- * @prompter_name: (allow-none): the prompter dbus name
+ * @prompter_name: (nullable): the prompter dbus name
  * @timeout_seconds: the number of seconds to wait to access the prompt, or -1
  * @cancellable: optional cancellation object
  * @callback: called when the operation completes
@@ -1483,7 +1483,7 @@ gcr_system_prompt_open (gint timeout_seconds,
 
 /**
  * gcr_system_prompt_open_for_prompter:
- * @prompter_name: (allow-none): the prompter dbus name
+ * @prompter_name: (nullable): the prompter dbus name
  * @timeout_seconds: the number of seconds to wait to access the prompt, or -1
  * @cancellable: optional cancellation object
  * @error: location to place error on failure
diff --git a/ui/gcr-certificate-renderer.c b/ui/gcr-certificate-renderer.c
index ff1c3af..09ac7ee 100644
--- a/ui/gcr-certificate-renderer.c
+++ b/ui/gcr-certificate-renderer.c
@@ -676,7 +676,7 @@ gcr_certificate_renderer_new (GcrCertificate *certificate)
 
 /**
  * gcr_certificate_renderer_new_for_attributes:
- * @label: (allow-none): the label to display
+ * @label: (nullable): the label to display
  * @attrs: The attributes to display
  *
  * Create a new certificate renderer to display the label and attributes. One
@@ -714,7 +714,7 @@ gcr_certificate_renderer_get_certificate (GcrCertificateRenderer *self)
 /**
  * gcr_certificate_renderer_set_certificate:
  * @self: The renderer
- * @certificate: (allow-none): the certificate to display
+ * @certificate: (nullable): the certificate to display
  *
  * Set a certificate to display in the renderer.
  */
@@ -744,7 +744,7 @@ gcr_certificate_renderer_set_certificate (GcrCertificateRenderer *self, GcrCerti
  *
  * Get the PKCS\#11 attributes, if any, set for this renderer to display.
  *
- * Returns: (allow-none) (transfer none): the attributes, owned by the renderer
+ * Returns: (nullable) (transfer none): the attributes, owned by the renderer
  *
  * Deprecated: 3.6: Use gcr_renderer_get_attributes() instead
  */
@@ -758,7 +758,7 @@ gcr_certificate_renderer_get_attributes (GcrCertificateRenderer *self)
 /**
  * gcr_certificate_renderer_set_attributes:
  * @self: The renderer
- * @attrs: (allow-none): attributes to set
+ * @attrs: (nullable): attributes to set
  *
  * Set the PKCS\#11 attributes for this renderer to display. One of the attributes
  * should be a CKA_VALUE type attribute containing a DER encoded certificate.
diff --git a/ui/gcr-certificate-request-renderer.c b/ui/gcr-certificate-request-renderer.c
index 6a42f2e..0d4e0e9 100644
--- a/ui/gcr-certificate-request-renderer.c
+++ b/ui/gcr-certificate-request-renderer.c
@@ -430,7 +430,7 @@ _gcr_certificate_request_renderer_iface (GcrRendererIface *iface)
 
 /**
  * gcr_certificate_request_renderer_new_for_attributes:
- * @label: (allow-none): the label to display
+ * @label: (nullable): the label to display
  * @attrs: the attributes to display
  *
  * Create a new certificate request renderer to display the label and attributes.
@@ -456,7 +456,7 @@ _gcr_certificate_request_renderer_new_for_attributes (const gchar *label,
  *
  * Get the PKCS\#11 attributes, if any, set for this renderer to display.
  *
- * Returns: (allow-none) (transfer none): the attributes, owned by the renderer
+ * Returns: (nullable) (transfer none): the attributes, owned by the renderer
  */
 GckAttributes *
 _gcr_certificate_request_renderer_get_attributes (GcrCertificateRequestRenderer *self)
@@ -468,7 +468,7 @@ _gcr_certificate_request_renderer_get_attributes (GcrCertificateRequestRenderer
 /**
  * gcr_certificate_request_renderer_set_attributes:
  * @self: the renderer
- * @attrs: (allow-none): attributes to set
+ * @attrs: (nullable): attributes to set
  *
  * Set the PKCS\#11 attributes for this renderer to display. One of the attributes
  * should be a CKA_VALUE type attribute containing a DER encoded PKCS\#10
diff --git a/ui/gcr-certificate-widget.c b/ui/gcr-certificate-widget.c
index 1f998e9..ab0547d 100644
--- a/ui/gcr-certificate-widget.c
+++ b/ui/gcr-certificate-widget.c
@@ -180,7 +180,7 @@ gcr_certificate_widget_class_init (GcrCertificateWidgetClass *klass)
 
 /**
  * gcr_certificate_widget_new:
- * @certificate: (allow-none): certificate to display, or %NULL
+ * @certificate: (nullable): certificate to display, or %NULL
  *
  * Create a new certificate widget which displays a given certificate.
  *
@@ -199,7 +199,7 @@ gcr_certificate_widget_new (GcrCertificate *certificate)
  *
  * Get the certificate displayed in the widget.
  *
- * Returns: (allow-none) (transfer none): the certificate
+ * Returns: (nullable) (transfer none): the certificate
  */
 GcrCertificate *
 gcr_certificate_widget_get_certificate (GcrCertificateWidget *self)
@@ -211,7 +211,7 @@ gcr_certificate_widget_get_certificate (GcrCertificateWidget *self)
 /**
  * gcr_certificate_widget_set_certificate:
  * @self: The certificate widget
- * @certificate: (allow-none): the certificate to display
+ * @certificate: (nullable): the certificate to display
  *
  * Set the certificate displayed in the widget
  */
@@ -229,7 +229,7 @@ gcr_certificate_widget_set_certificate (GcrCertificateWidget *self, GcrCertifica
  * Get the attributes displayed in the widget. The attributes should contain
  * a certificate.
  *
- * Returns: (allow-none) (transfer none): the attributes, owned by the widget
+ * Returns: (nullable) (transfer none): the attributes, owned by the widget
  *
  * Deprecated: 3.6: Use gcr_renderer_get_attributes() instead
  */
@@ -243,7 +243,7 @@ gcr_certificate_widget_get_attributes (GcrCertificateWidget *self)
 /**
  * gcr_certificate_widget_set_attributes:
  * @self: The certificate widget
- * @attrs: (allow-none): the attributes to display
+ * @attrs: (nullable): the attributes to display
  *
  * Set the attributes displayed in the widget. The attributes should contain
  * a certificate.
diff --git a/ui/gcr-collection-model.c b/ui/gcr-collection-model.c
index c1a2fa0..2b6ee8c 100644
--- a/ui/gcr-collection-model.c
+++ b/ui/gcr-collection-model.c
@@ -1387,7 +1387,7 @@ gcr_collection_model_get_collection (GcrCollectionModel *self)
 /**
  * gcr_collection_model_set_collection:
  * @self: a collection model
- * @collection: (allow-none): the collection or %NULL
+ * @collection: (nullable): the collection or %NULL
  *
  * Set the collection which this model represents
  */
diff --git a/ui/gcr-combo-selector.c b/ui/gcr-combo-selector.c
index 013c82f..e14d261 100644
--- a/ui/gcr-combo-selector.c
+++ b/ui/gcr-combo-selector.c
@@ -245,7 +245,7 @@ gcr_combo_selector_get_selected (GcrComboSelector *self)
 /**
  * gcr_combo_selector_set_selected:
  * @self: The selector
- * @selected: (allow-none): the object to select or %NULL
+ * @selected: (nullable): the object to select or %NULL
  *
  * Set the currently selected object in the selector, or clear the selection
  * if selected is set to %NULL.
diff --git a/ui/gcr-failure-renderer.c b/ui/gcr-failure-renderer.c
index 6029fd8..417559d 100644
--- a/ui/gcr-failure-renderer.c
+++ b/ui/gcr-failure-renderer.c
@@ -175,7 +175,7 @@ gcr_renderer_iface_init (GcrRendererIface *iface)
 
 /**
  * gcr_failure_renderer_new:
- * @label: (allow-none): the label for the failure
+ * @label: (nullable): the label for the failure
  * @error: the error to display
  *
  * Create a new renderer for an error.
diff --git a/ui/gcr-import-button.c b/ui/gcr-import-button.c
index 1fc5fca..c1840f1 100644
--- a/ui/gcr-import-button.c
+++ b/ui/gcr-import-button.c
@@ -527,7 +527,7 @@ gcr_import_button_class_init (GcrImportButtonClass *klass)
 
 /**
  * gcr_import_button_new:
- * @label: (allow-none): label to display on the button
+ * @label: (nullable): label to display on the button
  *
  * Create a new #GcrImportButton.
  *
diff --git a/ui/gcr-key-renderer.c b/ui/gcr-key-renderer.c
index a8c73cf..c2fedcc 100644
--- a/ui/gcr-key-renderer.c
+++ b/ui/gcr-key-renderer.c
@@ -428,8 +428,8 @@ gcr_key_renderer_renderer_iface (GcrRendererIface *iface)
 
 /**
  * gcr_key_renderer_new:
- * @label: (allow-none): label describing the key
- * @attrs: (allow-none): key to display, or %NULL
+ * @label: (nullable): label describing the key
+ * @attrs: (nullable): key to display, or %NULL
  *
  * Create a new key renderer which renders a given key in the attributes.
  *
@@ -445,7 +445,7 @@ gcr_key_renderer_new (const gchar *label, GckAttributes *attrs)
 /**
  * gcr_key_renderer_set_attributes:
  * @self: The key renderer
- * @attrs: (allow-none): the attributes to display
+ * @attrs: (nullable): the attributes to display
  *
  * Get the attributes displayed in the renderer. The attributes should represent
  * either an RSA, DSA, or EC key in PKCS\#11 style.
@@ -471,7 +471,7 @@ gcr_key_renderer_set_attributes (GcrKeyRenderer *self, GckAttributes *attrs)
  *
  * Get the attributes displayed in the renderer.
  *
- * Returns: (transfer none) (allow-none): the attributes, owned by the renderer
+ * Returns: (transfer none) (nullable): the attributes, owned by the renderer
  */
 GckAttributes*
 gcr_key_renderer_get_attributes (GcrKeyRenderer *self)
diff --git a/ui/gcr-key-widget.c b/ui/gcr-key-widget.c
index 5f5f192..d81964d 100644
--- a/ui/gcr-key-widget.c
+++ b/ui/gcr-key-widget.c
@@ -177,7 +177,7 @@ gcr_key_widget_class_init (GcrKeyWidgetClass *klass)
 
 /**
  * gcr_key_widget_new:
- * @attrs: (allow-none): key to display, or %NULL
+ * @attrs: (nullable): key to display, or %NULL
  *
  * Create a new key widget which displays a given key in the attributes.
  *
@@ -193,7 +193,7 @@ gcr_key_widget_new (GckAttributes *attrs)
 /**
  * gcr_key_widget_set_attributes:
  * @self: The key widget
- * @attrs: (allow-none): the attributes to display
+ * @attrs: (nullable): the attributes to display
  *
  * Get the attributes displayed in the widget. The attributes should represent
  * either an RSA, DSA or EC key in PKCS\#11 style.
@@ -211,7 +211,7 @@ gcr_key_widget_set_attributes (GcrKeyWidget *self, GckAttributes *attrs)
  *
  * Get the attributes displayed in the widget.
  *
- * Returns: (allow-none) (transfer none): The attributes, owned by the widget.
+ * Returns: (nullable) (transfer none): The attributes, owned by the widget.
  */
 GckAttributes*
 gcr_key_widget_get_attributes (GcrKeyWidget *self)
diff --git a/ui/gcr-live-search.c b/ui/gcr-live-search.c
index 283ffc6..316a8d2 100644
--- a/ui/gcr-live-search.c
+++ b/ui/gcr-live-search.c
@@ -546,7 +546,7 @@ _gcr_live_search_init (GcrLiveSearch *self)
 
 /**
  * _gcr_live_search_new:
- * @hook: (allow-none): the widget to hook
+ * @hook: (nullable): the widget to hook
  *
  * Create a new #GcrLiveSearch.
  *
diff --git a/ui/gcr-renderer.c b/ui/gcr-renderer.c
index cba7492..4edcb70 100644
--- a/ui/gcr-renderer.c
+++ b/ui/gcr-renderer.c
@@ -190,7 +190,7 @@ gcr_renderer_emit_data_changed (GcrRenderer *self)
  *
  * Get the PKCS\#11 attributes, if any, set for this renderer to display.
  *
- * Returns: (allow-none) (transfer none): the attributes, owned by the renderer
+ * Returns: (nullable) (transfer none): the attributes, owned by the renderer
  */
 GckAttributes *
 gcr_renderer_get_attributes (GcrRenderer *self)
@@ -208,7 +208,7 @@ gcr_renderer_get_attributes (GcrRenderer *self)
 /**
  * gcr_renderer_set_attributes:
  * @self: The renderer
- * @attrs: (allow-none): attributes to set
+ * @attrs: (nullable): attributes to set
  *
  * Set the PKCS\#11 attributes for this renderer to display.
  */
@@ -242,13 +242,13 @@ sort_registered_by_n_attrs (gconstpointer a, gconstpointer b)
 
 /**
  * gcr_renderer_create:
- * @label: (allow-none): The label for the renderer
+ * @label: (nullable): The label for the renderer
  * @attrs: The attributes to render
  *
  * Create and initialize a renderer for the given attributes and label. These
  * renderers should have been preregistered via gcr_renderer_register().
  *
- * Returns: (transfer full) (allow-none): a new renderer, or %NULL if no renderer
+ * Returns: (transfer full) (nullable): a new renderer, or %NULL if no renderer
  *          matched the attributes; the render should be released with g_object_unref()
  */
 GcrRenderer *
diff --git a/ui/gcr-viewer-widget.c b/ui/gcr-viewer-widget.c
index 28c60b7..61b1d50 100644
--- a/ui/gcr-viewer-widget.c
+++ b/ui/gcr-viewer-widget.c
@@ -529,7 +529,7 @@ gcr_viewer_widget_load_file (GcrViewerWidget *self,
 /**
  * gcr_viewer_widget_load_bytes:
  * @self: a viewer widget
- * @display_name: (allow-none): label for the loaded data
+ * @display_name: (nullable): label for the loaded data
  * @data: data to load
  *
  * Parse and load some data to be displayed into the viewer widgets. The data
@@ -561,7 +561,7 @@ gcr_viewer_widget_load_bytes (GcrViewerWidget *self,
 /**
  * gcr_viewer_widget_load_data:
  * @self: a viewer widget
- * @display_name: (allow-none): label for the loaded data
+ * @display_name: (nullable): label for the loaded data
  * @data: (array length=n_data): data to load
  * @n_data: length of data to load
  *
@@ -621,7 +621,7 @@ gcr_viewer_widget_get_parser (GcrViewerWidget *self)
  * gcr_viewer_widget_show_error:
  * @self: a viewer widget
  * @message: descriptive error message
- * @error: (allow-none): detailed error
+ * @error: (nullable): detailed error
  *
  * Show an error on the viewer widget. This is displayed on a info bar near
  * the edge of the widget.
diff --git a/ui/gcr-viewer.c b/ui/gcr-viewer.c
index c2c50ef..afd98aa 100644
--- a/ui/gcr-viewer.c
+++ b/ui/gcr-viewer.c
@@ -119,7 +119,7 @@ gcr_viewer_add_renderer (GcrViewer *viewer,
  * gcr_viewer_insert_renderer:
  * @viewer: the viewer
  * @renderer: the renderer to insert
- * @before: (allow-none): the renderer to insert before
+ * @before: (nullable): the renderer to insert before
  *
  * Insert a renderer at a specific point in the viewer
  */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]