summaryrefslogtreecommitdiff
path: root/gio/gsocketaddressenumerator.c
diff options
context:
space:
mode:
authorChristian Hergert <chergert@redhat.com>2016-10-28 18:29:02 -0700
committerChristian Hergert <chergert@redhat.com>2016-11-22 14:14:37 -0800
commit18a33f72db6a410606674d8d53fb2dadb706091d (patch)
treed12312302fad79c562f796d250ede4b58c2e0b01 /gio/gsocketaddressenumerator.c
parenta4012abbdf2c6c095ae34a97dca760b2446436aa (diff)
downloadglib-18a33f72db6a410606674d8d53fb2dadb706091d.tar.gz
introspection: use (nullable) or (optional) instead of (allow-none)
If we have an input parameter (or return value) we need to use (nullable). However, if it is an (inout) or (out) parameter, (optional) is sufficient. It looks like (nullable) could be used for everything according to the Annotation documentation, but (optional) is more specific.
Diffstat (limited to 'gio/gsocketaddressenumerator.c')
-rw-r--r--gio/gsocketaddressenumerator.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gio/gsocketaddressenumerator.c b/gio/gsocketaddressenumerator.c
index f703f5787..2b6935a8f 100644
--- a/gio/gsocketaddressenumerator.c
+++ b/gio/gsocketaddressenumerator.c
@@ -48,7 +48,7 @@ g_socket_address_enumerator_class_init (GSocketAddressEnumeratorClass *enumerato
/**
* g_socket_address_enumerator_next:
* @enumerator: a #GSocketAddressEnumerator
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: a #GError.
*
* Retrieves the next #GSocketAddress from @enumerator. Note that this
@@ -112,7 +112,7 @@ g_socket_address_enumerator_real_next_async (GSocketAddressEnumerator *enumerato
/**
* g_socket_address_enumerator_next_async:
* @enumerator: a #GSocketAddressEnumerator
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @callback: (scope async): a #GAsyncReadyCallback to call when the request
* is satisfied
* @user_data: (closure): the data to pass to callback function