[glib] introspection: use (nullable) or (optional) instead of (allow-none)
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] introspection: use (nullable) or (optional) instead of (allow-none)
- Date: Tue, 22 Nov 2016 22:15:18 +0000 (UTC)
commit 18a33f72db6a410606674d8d53fb2dadb706091d
Author: Christian Hergert <chergert redhat com>
Date: Fri Oct 28 18:29:02 2016 -0700
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.
gio/gaction.c | 8 +-
gio/gactiongroup.c | 10 +-
gio/gappinfo.c | 18 ++--
gio/gapplication.c | 14 ++--
gio/gapplicationcommandline.c | 2 +-
gio/gasyncinitable.c | 2 +-
gio/gbufferedinputstream.c | 6 +-
gio/gcancellable.c | 12 +-
gio/gcontenttype.c | 8 +-
gio/gdatagrambased.c | 2 +-
gio/gdatainputstream.c | 28 +++---
gio/gdataoutputstream.c | 16 ++--
gio/gdbusaddress.c | 6 +-
gio/gdbusauthobserver.c | 4 +-
gio/gdbusconnection.c | 118 +++++++++++-----------
gio/gdbusconnection.h | 2 +-
gio/gdbuserror.c | 4 +-
gio/gdbusinterface.c | 2 +-
gio/gdbusintrospection.c | 2 +-
gio/gdbusmessage.c | 8 +-
gio/gdbusmethodinvocation.c | 12 +-
gio/gdbusnameowning.c | 24 ++--
gio/gdbusnamewatching.c | 20 ++--
gio/gdbusobjectmanagerclient.c | 26 +++---
gio/gdbusobjectmanagerserver.c | 2 +-
gio/gdbusprivate.c | 6 +-
gio/gdbusproxy.c | 56 +++++-----
gio/gdbusserver.c | 4 +-
gio/gdesktopappinfo.c | 14 ++--
gio/gdrive.c | 26 +++---
gio/gdtlsclientconnection.c | 2 +-
gio/gdtlsconnection.c | 6 +-
gio/gdtlsserverconnection.c | 2 +-
gio/gemblemedicon.c | 2 +-
gio/gfile.c | 218 ++++++++++++++++++++--------------------
gio/gfileenumerator.c | 14 ++--
gio/gfileinfo.c | 2 +-
gio/gfileinputstream.c | 4 +-
gio/gfileiostream.c | 4 +-
gio/gfilemonitor.c | 2 +-
gio/gicon.c | 4 +-
gio/ginitable.c | 2 +-
gio/ginputstream.c | 20 ++--
gio/giomodule.c | 6 +-
gio/gioscheduler.c | 6 +-
gio/giostream.c | 6 +-
gio/giotypes.h | 6 +-
gio/gkeyfilesettingsbackend.c | 2 +-
gio/gloadableicon.c | 4 +-
gio/gmemoryinputstream.c | 4 +-
gio/gmemoryoutputstream.c | 6 +-
gio/gmenu.c | 54 +++++-----
gio/gmenumodel.c | 10 +-
gio/gmount.c | 30 +++---
gio/gnetworkmonitor.c | 4 +-
gio/gnotification.c | 16 ++--
gio/goutputstream.c | 28 +++---
gio/gpermission.c | 8 +-
gio/gpollableinputstream.c | 4 +-
gio/gpollableoutputstream.c | 4 +-
gio/gpollableutils.c | 10 +-
gio/gproxy.c | 4 +-
gio/gproxyaddress.c | 4 +-
gio/gproxyresolver.c | 4 +-
gio/gremoteactiongroup.c | 2 +-
gio/gresolver.c | 16 ++--
gio/gresource.c | 8 +-
gio/gseekable.c | 4 +-
gio/gsettings.c | 12 +-
gio/gsettingsbackend.c | 4 +-
gio/gsettingsschema.c | 2 +-
gio/gsimpleaction.c | 10 +-
gio/gsimpleasyncresult.c | 22 ++--
gio/gsimpleproxyresolver.c | 4 +-
gio/gsocket.c | 44 ++++----
gio/gsocketaddressenumerator.c | 4 +-
gio/gsocketclient.c | 20 ++--
gio/gsocketconnection.c | 4 +-
gio/gsocketlistener.c | 26 +++---
gio/gsocketservice.c | 2 +-
gio/gsubprocess.c | 14 ++--
gio/gtask.c | 18 ++--
gio/gtestdbus.c | 2 +-
gio/gtlscertificate.c | 4 +-
gio/gtlsclientconnection.c | 2 +-
gio/gtlsconnection.c | 6 +-
gio/gtlsdatabase.c | 46 ++++----
gio/gtlsinteraction.c | 8 +-
gio/gtlspassword.c | 4 +-
gio/gtlsserverconnection.c | 2 +-
gio/gunixconnection.c | 16 ++--
gio/gunixfdlist.c | 4 +-
gio/gunixfdmessage.c | 2 +-
gio/gunixmounts.c | 8 +-
gio/gvolume.c | 16 ++--
gio/gwin32registrykey.c | 8 +-
gio/gzlibcompressor.c | 2 +-
gio/tests/file.c | 2 +-
gio/tests/test-pipe-unix.c | 8 +-
glib/garray.c | 6 +-
glib/gbookmarkfile.c | 36 ++++----
glib/gconvert.c | 5 +-
glib/gdataset.c | 20 ++--
glib/gdatetime.c | 6 +-
glib/genviron.c | 6 +-
glib/gerror.c | 2 +-
glib/gfileutils.c | 6 +-
glib/ggettext.c | 10 +-
glib/ghash.c | 6 +-
glib/giochannel.c | 12 +-
glib/gkeyfile.c | 28 +++---
glib/glib-init.c | 2 +-
glib/gmain.c | 36 ++++----
glib/gmarkup.c | 4 +-
glib/gmem.c | 10 +-
glib/gmessages.c | 8 +-
glib/goption.c | 34 +++---
glib/gpattern.c | 2 +-
glib/gquark.c | 10 +-
glib/gregex.c | 28 +++---
glib/gsequence.c | 2 +-
glib/gspawn.c | 40 ++++----
glib/gstdio.c | 2 +-
glib/gstrfuncs.c | 8 +-
glib/gtestutils.c | 10 +-
glib/gthread.c | 4 +-
glib/gtimezone.c | 2 +-
glib/gtranslit.c | 2 +-
glib/gunidecomp.c | 2 +-
glib/gurifuncs.c | 10 +-
glib/gutf8.c | 2 +-
glib/gvariant-parser.c | 8 +-
glib/gvariant-serialiser.c | 2 +-
glib/gvariant.c | 52 +++++-----
glib/gvarianttype.c | 6 +-
glib/gvarianttypeinfo.c | 8 +-
glib/gwin32.c | 10 +-
gmodule/gmodule.c | 4 +-
gobject/gbinding.c | 4 +-
gobject/gboxed.c | 8 +-
gobject/gclosure.c | 6 +-
gobject/gclosure.h | 10 +-
gobject/gmarshal.c | 88 ++++++++--------
gobject/gobject.c | 34 +++---
gobject/gparam.c | 6 +-
gobject/gparamspecs.c | 2 +-
gobject/gsignal.c | 20 ++--
gobject/gtype.c | 6 +-
gobject/gvalue.c | 2 +-
gobject/gvaluearray.c | 6 +-
gobject/gvaluetypes.c | 10 +-
151 files changed, 986 insertions(+), 987 deletions(-)
---
diff --git a/gio/gaction.c b/gio/gaction.c
index 2075bb0..bc2c934 100644
--- a/gio/gaction.c
+++ b/gio/gaction.c
@@ -269,7 +269,7 @@ g_action_get_name (GAction *action)
* In the case that this function returns %NULL, you must not give any
* #GVariant, but %NULL instead.
*
- * Returns: (allow-none): the parameter type
+ * Returns: (nullable): the parameter type
*
* Since: 2.28
**/
@@ -299,7 +299,7 @@ g_action_get_parameter_type (GAction *action)
* then this function will return %NULL. In that case, g_action_get_state()
* will return %NULL and you must not call g_action_change_state().
*
- * Returns: (allow-none): the state type, if the action is stateful
+ * Returns: (nullable): the state type, if the action is stateful
*
* Since: 2.28
**/
@@ -373,7 +373,7 @@ g_action_get_enabled (GAction *action)
/**
* g_action_activate:
* @action: a #GAction
- * @parameter: (allow-none): the parameter to the activation
+ * @parameter: (nullable): the parameter to the activation
*
* Activates the action.
*
@@ -542,7 +542,7 @@ bad_fmt:
/**
* g_action_print_detailed_name:
* @action_name: a valid action name
- * @target_value: (allow-none): a #GVariant target value, or %NULL
+ * @target_value: (nullable): a #GVariant target value, or %NULL
*
* Formats a detailed action name from @action_name and @target_value.
*
diff --git a/gio/gactiongroup.c b/gio/gactiongroup.c
index 425a20a..eef46b4 100644
--- a/gio/gactiongroup.c
+++ b/gio/gactiongroup.c
@@ -573,7 +573,7 @@ g_action_group_change_action_state (GActionGroup *action_group,
* g_action_group_activate_action:
* @action_group: a #GActionGroup
* @action_name: the name of the action to activate
- * @parameter: (allow-none): parameters to the activation
+ * @parameter: (nullable): parameters to the activation
*
* Activate the named action within @action_group.
*
@@ -705,10 +705,10 @@ g_action_group_action_state_changed (GActionGroup *action_group,
* @action_group: a #GActionGroup
* @action_name: the name of an action in the group
* @enabled: (out): if the action is presently enabled
- * @parameter_type: (out) (allow-none): the parameter type, or %NULL if none needed
- * @state_type: (out) (allow-none): the state type, or %NULL if stateless
- * @state_hint: (out) (allow-none): the state hint, or %NULL if none
- * @state: (out) (allow-none): the current state, or %NULL if stateless
+ * @parameter_type: (out) (optional): the parameter type, or %NULL if none needed
+ * @state_type: (out) (optional): the state type, or %NULL if stateless
+ * @state_hint: (out) (optional): the state hint, or %NULL if none
+ * @state: (out) (optional): the current state, or %NULL if stateless
*
* Queries all aspects of the named action within an @action_group.
*
diff --git a/gio/gappinfo.c b/gio/gappinfo.c
index 99cb7b6..5c4baa2 100644
--- a/gio/gappinfo.c
+++ b/gio/gappinfo.c
@@ -528,8 +528,8 @@ g_app_info_get_icon (GAppInfo *appinfo)
/**
* g_app_info_launch:
* @appinfo: a #GAppInfo
- * @files: (allow-none) (element-type GFile): a #GList of #GFile objects
- * @launch_context: (allow-none): a #GAppLaunchContext or %NULL
+ * @files: (nullable) (element-type GFile): a #GList of #GFile objects
+ * @launch_context: (nullable): a #GAppLaunchContext or %NULL
* @error: a #GError
*
* Launches the application. Passes @files to the launched application
@@ -623,8 +623,8 @@ g_app_info_supports_files (GAppInfo *appinfo)
/**
* g_app_info_launch_uris:
* @appinfo: a #GAppInfo
- * @uris: (allow-none) (element-type utf8): a #GList containing URIs to launch.
- * @launch_context: (allow-none): a #GAppLaunchContext or %NULL
+ * @uris: (nullable) (element-type utf8): a #GList containing URIs to launch.
+ * @launch_context: (nullable): a #GAppLaunchContext or %NULL
* @error: a #GError
*
* Launches the application. This passes the @uris to the launched application
@@ -877,7 +877,7 @@ launch_default_for_uri (const char *uri,
/**
* g_app_info_launch_default_for_uri:
* @uri: the uri to show
- * @launch_context: (allow-none): an optional #GAppLaunchContext
+ * @launch_context: (nullable): an optional #GAppLaunchContext
* @error: (nullable): return location for an error, or %NULL
*
* Utility function that launches the default application
@@ -903,10 +903,10 @@ g_app_info_launch_default_for_uri (const char *uri,
/**
* g_app_info_launch_default_for_uri_async:
* @uri: the uri to show
- * @context: (allow-none): an optional #GAppLaunchContext
- * cancellable: (allow-none): a #GCancellable
- * @callback: (allow-none): a #GASyncReadyCallback to call when the request is done
- * @user_data: (allow-none): data to pass to @callback
+ * @context: (nullable): an optional #GAppLaunchContext
+ * cancellable: (nullable): a #GCancellable
+ * @callback: (nullable): a #GASyncReadyCallback to call when the request is done
+ * @user_data: (nullable): data to pass to @callback
*
* Async version of g_app_info_launch_default_for_uri().
*
diff --git a/gio/gapplication.c b/gio/gapplication.c
index 8711e50..e068aef 100644
--- a/gio/gapplication.c
+++ b/gio/gapplication.c
@@ -1145,7 +1145,7 @@ g_application_set_property (GObject *object,
/**
* g_application_set_action_group:
* @application: a #GApplication
- * @action_group: (allow-none): a #GActionGroup, or %NULL
+ * @action_group: (nullable): a #GActionGroup, or %NULL
*
* This used to be how actions were associated with a #GApplication.
* Now there is #GActionMap for that.
@@ -1606,7 +1606,7 @@ g_application_id_is_valid (const gchar *application_id)
/* Public Constructor {{{1 */
/**
* g_application_new:
- * @application_id: (allow-none): the application id
+ * @application_id: (nullable): the application id
* @flags: the application flags
*
* Creates a new #GApplication instance.
@@ -1653,7 +1653,7 @@ g_application_get_application_id (GApplication *application)
/**
* g_application_set_application_id:
* @application: a #GApplication
- * @application_id: (allow-none): the identifier for @application
+ * @application_id: (nullable): the identifier for @application
*
* Sets the unique identifier for @application.
*
@@ -1979,7 +1979,7 @@ g_application_get_dbus_object_path (GApplication *application)
/**
* g_application_register:
* @application: a #GApplication
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @error: a pointer to a NULL #GError, or %NULL
*
* Attempts registration of the application.
@@ -2198,7 +2198,7 @@ g_application_open (GApplication *application,
* g_application_run:
* @application: a #GApplication
* @argc: the argc from main() (or 0 if @argv is %NULL)
- * @argv: (array length=argc) (allow-none): the argv from main(), or %NULL
+ * @argv: (array length=argc) (nullable): the argv from main(), or %NULL
*
* Runs the application.
*
@@ -2577,7 +2577,7 @@ g_application_get_default (void)
/**
* g_application_set_default:
- * @application: (allow-none): the application to set as default, or %NULL
+ * @application: (nullable): the application to set as default, or %NULL
*
* Sets or unsets the default application for the process, as returned
* by g_application_get_default().
@@ -2705,7 +2705,7 @@ g_application_get_is_busy (GApplication *application)
/**
* g_application_send_notification:
* @application: a #GApplication
- * @id: (allow-none): id of the notification, or %NULL
+ * @id: (nullable): id of the notification, or %NULL
* @notification: the #GNotification to send
*
* Sends a notification on behalf of @application to the desktop shell.
diff --git a/gio/gapplicationcommandline.c b/gio/gapplicationcommandline.c
index c042da0..f2fe025 100644
--- a/gio/gapplicationcommandline.c
+++ b/gio/gapplicationcommandline.c
@@ -449,7 +449,7 @@ g_application_command_line_class_init (GApplicationCommandLineClass *class)
/**
* g_application_command_line_get_arguments:
* @cmdline: a #GApplicationCommandLine
- * @argc: (out) (allow-none): the length of the arguments array, or %NULL
+ * @argc: (out) (optional): the length of the arguments array, or %NULL
*
* Gets the list of arguments that was passed on the command line.
*
diff --git a/gio/gasyncinitable.c b/gio/gasyncinitable.c
index db93201..827bffc 100644
--- a/gio/gasyncinitable.c
+++ b/gio/gasyncinitable.c
@@ -311,7 +311,7 @@ g_async_initable_real_init_finish (GAsyncInitable *initable,
* @callback: a #GAsyncReadyCallback to call when the initialization is
* finished
* @user_data: the data to pass to callback function
- * @first_property_name: (allow-none): the name of the first property, or %NULL if no
+ * @first_property_name: (nullable): the name of the first property, or %NULL if no
* properties
* @...: the value of the first property, followed by other property
* value pairs, and ended by %NULL.
diff --git a/gio/gbufferedinputstream.c b/gio/gbufferedinputstream.c
index 4a79660..5aaf728 100644
--- a/gio/gbufferedinputstream.c
+++ b/gio/gbufferedinputstream.c
@@ -369,7 +369,7 @@ g_buffered_input_stream_new_sized (GInputStream *base_stream,
* g_buffered_input_stream_fill:
* @stream: a #GBufferedInputStream
* @count: the number of bytes that will be read from the stream
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore
* @error: location to store the error occurring, or %NULL to ignore
*
* Tries to read @count bytes from the stream into the buffer.
@@ -455,7 +455,7 @@ async_fill_callback_wrapper (GObject *source_object,
* @stream: a #GBufferedInputStream
* @count: the number of bytes that will be read from the stream
* @io_priority: the [I/O priority][io-priority] of the request
- * @cancellable: (allow-none): optional #GCancellable object
+ * @cancellable: (nullable): optional #GCancellable object
* @callback: (scope async): a #GAsyncReadyCallback
* @user_data: (closure): a #gpointer
*
@@ -941,7 +941,7 @@ g_buffered_input_stream_truncate (GSeekable *seekable,
/**
* g_buffered_input_stream_read_byte:
* @stream: a #GBufferedInputStream
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore
* @error: location to store the error occurring, or %NULL to ignore
*
* Tries to read a single byte from the stream or the buffer. Will block
diff --git a/gio/gcancellable.c b/gio/gcancellable.c
index 42785b2..2d09836 100644
--- a/gio/gcancellable.c
+++ b/gio/gcancellable.c
@@ -282,7 +282,7 @@ g_cancellable_reset (GCancellable *cancellable)
/**
* g_cancellable_is_cancelled:
- * @cancellable: (allow-none): a #GCancellable or %NULL
+ * @cancellable: (nullable): a #GCancellable or %NULL
*
* Checks if a cancellable job has been cancelled.
*
@@ -297,7 +297,7 @@ g_cancellable_is_cancelled (GCancellable *cancellable)
/**
* g_cancellable_set_error_if_cancelled:
- * @cancellable: (allow-none): a #GCancellable or %NULL
+ * @cancellable: (nullable): a #GCancellable or %NULL
* @error: #GError to append error state to
*
* If the @cancellable is cancelled, sets the error to notify
@@ -361,7 +361,7 @@ g_cancellable_get_fd (GCancellable *cancellable)
/**
* g_cancellable_make_pollfd:
- * @cancellable: (allow-none): a #GCancellable or %NULL
+ * @cancellable: (nullable): a #GCancellable or %NULL
* @pollfd: a pointer to a #GPollFD
*
* Creates a #GPollFD corresponding to @cancellable; this can be passed
@@ -524,7 +524,7 @@ g_cancellable_cancel (GCancellable *cancellable)
* @cancellable: A #GCancellable.
* @callback: The #GCallback to connect.
* @data: Data to pass to @callback.
- * @data_destroy_func: (allow-none): Free function for @data or %NULL.
+ * @data_destroy_func: (nullable): Free function for @data or %NULL.
*
* Convenience function to connect to the #GCancellable::cancelled
* signal. Also handles the race condition that may happen
@@ -593,7 +593,7 @@ g_cancellable_connect (GCancellable *cancellable,
/**
* g_cancellable_disconnect:
- * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
* @handler_id: Handler id of the handler to be disconnected, or %0.
*
* Disconnects a handler from a cancellable instance similar to
@@ -714,7 +714,7 @@ static GSourceFuncs cancellable_source_funcs =
/**
* g_cancellable_source_new: (skip)
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
*
* Creates a source that triggers if @cancellable is cancelled and
* calls its callback of type #GCancellableSourceFunc. This is
diff --git a/gio/gcontenttype.c b/gio/gcontenttype.c
index 9586c31..76a5b13 100644
--- a/gio/gcontenttype.c
+++ b/gio/gcontenttype.c
@@ -486,7 +486,7 @@ g_content_type_get_symbolic_icon (const gchar *type)
* [shared-mime-info](http://www.freedesktop.org/wiki/Specifications/shared-mime-info-spec)
* specification for more on the generic icon name.
*
- * Returns: (allow-none): the registered generic icon name for the given @type,
+ * Returns: (nullable): the registered generic icon name for the given @type,
* or %NULL if unknown. Free with g_free()
*
* Since: 2.34
@@ -591,10 +591,10 @@ g_content_type_from_mime_type (const gchar *mime_type)
/**
* g_content_type_guess:
- * @filename: (allow-none): a string, or %NULL
- * @data: (allow-none) (array length=data_size): a stream of data, or %NULL
+ * @filename: (nullable): a string, or %NULL
+ * @data: (nullable) (array length=data_size): a stream of data, or %NULL
* @data_size: the size of @data
- * @result_uncertain: (allow-none) (out): return location for the certainty
+ * @result_uncertain: (out) (optional): return location for the certainty
* of the result, or %NULL
*
* Guesses the content type based on example data. If the function is
diff --git a/gio/gdatagrambased.c b/gio/gdatagrambased.c
index afb37e3..af3eb63 100644
--- a/gio/gdatagrambased.c
+++ b/gio/gdatagrambased.c
@@ -102,7 +102,7 @@ g_datagram_based_default_init (GDatagramBasedInterface *iface)
* @flags: an int containing #GSocketMsgFlags flags for the overall operation
* @timeout: the maximum time (in microseconds) to wait, 0 to not block, or -1
* to block indefinitely
- * @cancellable: (allow-none): a %GCancellable
+ * @cancellable: (nullable): a %GCancellable
* @error: return location for a #GError
*
* Receive one or more data messages from @datagram_based in one go.
diff --git a/gio/gdatainputstream.c b/gio/gdatainputstream.c
index 9a7e722..4c50f35 100644
--- a/gio/gdatainputstream.c
+++ b/gio/gdatainputstream.c
@@ -318,7 +318,7 @@ read_data (GDataInputStream *stream,
/**
* g_data_input_stream_read_byte:
* @stream: a given #GDataInputStream.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: #GError for error reporting.
*
* Reads an unsigned 8-bit/1-byte value from @stream.
@@ -345,7 +345,7 @@ g_data_input_stream_read_byte (GDataInputStream *stream,
/**
* g_data_input_stream_read_int16:
* @stream: a given #GDataInputStream.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: #GError for error reporting.
*
* Reads a 16-bit/2-byte value from @stream.
@@ -389,7 +389,7 @@ g_data_input_stream_read_int16 (GDataInputStream *stream,
/**
* g_data_input_stream_read_uint16:
* @stream: a given #GDataInputStream.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: #GError for error reporting.
*
* Reads an unsigned 16-bit/2-byte value from @stream.
@@ -433,7 +433,7 @@ g_data_input_stream_read_uint16 (GDataInputStream *stream,
/**
* g_data_input_stream_read_int32:
* @stream: a given #GDataInputStream.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: #GError for error reporting.
*
* Reads a signed 32-bit/4-byte value from @stream.
@@ -481,7 +481,7 @@ g_data_input_stream_read_int32 (GDataInputStream *stream,
/**
* g_data_input_stream_read_uint32:
* @stream: a given #GDataInputStream.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: #GError for error reporting.
*
* Reads an unsigned 32-bit/4-byte value from @stream.
@@ -529,7 +529,7 @@ g_data_input_stream_read_uint32 (GDataInputStream *stream,
/**
* g_data_input_stream_read_int64:
* @stream: a given #GDataInputStream.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: #GError for error reporting.
*
* Reads a 64-bit/8-byte value from @stream.
@@ -577,7 +577,7 @@ g_data_input_stream_read_int64 (GDataInputStream *stream,
/**
* g_data_input_stream_read_uint64:
* @stream: a given #GDataInputStream.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: #GError for error reporting.
*
* Reads an unsigned 64-bit/8-byte value from @stream.
@@ -724,7 +724,7 @@ scan_for_newline (GDataInputStream *stream,
* g_data_input_stream_read_line:
* @stream: a given #GDataInputStream.
* @length: (out): a #gsize to get the length of the data read in.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: #GError for error reporting.
*
* Reads a line from the data input stream. Note that no encoding
@@ -810,7 +810,7 @@ g_data_input_stream_read_line (GDataInputStream *stream,
* g_data_input_stream_read_line_utf8:
* @stream: a given #GDataInputStream.
* @length: (out): a #gsize to get the length of the data read in.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: #GError for error reporting.
*
* Reads a UTF-8 encoded line from the data input stream.
@@ -896,7 +896,7 @@ scan_for_chars (GDataInputStream *stream,
* @stream: a given #GDataInputStream.
* @stop_chars: characters to terminate the read.
* @length: (out): a #gsize to get the length of the data read in.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: #GError for error reporting.
*
* Reads a string from the data input stream, up to the first
@@ -1117,7 +1117,7 @@ g_data_input_stream_read_finish (GDataInputStream *stream,
* g_data_input_stream_read_line_async:
* @stream: a given #GDataInputStream.
* @io_priority: the [I/O priority][io-priority] of the request
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @callback: (scope async): callback to call when the request is satisfied.
* @user_data: (closure): the data to pass to callback function.
*
@@ -1149,7 +1149,7 @@ g_data_input_stream_read_line_async (GDataInputStream *stream,
* @stream: a given #GDataInputStream.
* @stop_chars: characters to terminate the read.
* @io_priority: the [I/O priority][io-priority] of the request
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @callback: (scope async): callback to call when the request is satisfied.
* @user_data: (closure): the data to pass to callback function.
*
@@ -1296,7 +1296,7 @@ g_data_input_stream_read_until_finish (GDataInputStream *stream,
* @stop_chars_len: length of @stop_chars. May be -1 if @stop_chars is
* nul-terminated
* @length: (out): a #gsize to get the length of the data read in
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore
* @error: #GError for error reporting
*
* Reads a string from the data input stream, up to the first
@@ -1388,7 +1388,7 @@ g_data_input_stream_read_upto (GDataInputStream *stream,
* @stop_chars_len: length of @stop_chars. May be -1 if @stop_chars is
* nul-terminated
* @io_priority: the [I/O priority][io-priority] of the request
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore
* @callback: (scope async): callback to call when the request is satisfied
* @user_data: (closure): the data to pass to callback function
*
diff --git a/gio/gdataoutputstream.c b/gio/gdataoutputstream.c
index ea7deb1..960c8da 100644
--- a/gio/gdataoutputstream.c
+++ b/gio/gdataoutputstream.c
@@ -232,7 +232,7 @@ g_data_output_stream_get_byte_order (GDataOutputStream *stream)
* g_data_output_stream_put_byte:
* @stream: a #GDataOutputStream.
* @data: a #guchar.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: a #GError, %NULL to ignore.
*
* Puts a byte into the output stream.
@@ -259,7 +259,7 @@ g_data_output_stream_put_byte (GDataOutputStream *stream,
* g_data_output_stream_put_int16:
* @stream: a #GDataOutputStream.
* @data: a #gint16.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: a #GError, %NULL to ignore.
*
* Puts a signed 16-bit integer into the output stream.
@@ -299,7 +299,7 @@ g_data_output_stream_put_int16 (GDataOutputStream *stream,
* g_data_output_stream_put_uint16:
* @stream: a #GDataOutputStream.
* @data: a #guint16.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: a #GError, %NULL to ignore.
*
* Puts an unsigned 16-bit integer into the output stream.
@@ -339,7 +339,7 @@ g_data_output_stream_put_uint16 (GDataOutputStream *stream,
* g_data_output_stream_put_int32:
* @stream: a #GDataOutputStream.
* @data: a #gint32.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: a #GError, %NULL to ignore.
*
* Puts a signed 32-bit integer into the output stream.
@@ -379,7 +379,7 @@ g_data_output_stream_put_int32 (GDataOutputStream *stream,
* g_data_output_stream_put_uint32:
* @stream: a #GDataOutputStream.
* @data: a #guint32.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: a #GError, %NULL to ignore.
*
* Puts an unsigned 32-bit integer into the stream.
@@ -419,7 +419,7 @@ g_data_output_stream_put_uint32 (GDataOutputStream *stream,
* g_data_output_stream_put_int64:
* @stream: a #GDataOutputStream.
* @data: a #gint64.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: a #GError, %NULL to ignore.
*
* Puts a signed 64-bit integer into the stream.
@@ -459,7 +459,7 @@ g_data_output_stream_put_int64 (GDataOutputStream *stream,
* g_data_output_stream_put_uint64:
* @stream: a #GDataOutputStream.
* @data: a #guint64.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: a #GError, %NULL to ignore.
*
* Puts an unsigned 64-bit integer into the stream.
@@ -499,7 +499,7 @@ g_data_output_stream_put_uint64 (GDataOutputStream *stream,
* g_data_output_stream_put_string:
* @stream: a #GDataOutputStream.
* @str: a string.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: a #GError, %NULL to ignore.
*
* Puts a string into the output stream.
diff --git a/gio/gdbusaddress.c b/gio/gdbusaddress.c
index 23f18c9..a9130ef 100644
--- a/gio/gdbusaddress.c
+++ b/gio/gdbusaddress.c
@@ -833,7 +833,7 @@ get_stream_thread_func (GTask *task,
/**
* g_dbus_address_get_stream:
* @address: A valid D-Bus address.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
* @callback: A #GAsyncReadyCallback to call when the request is satisfied.
* @user_data: Data to pass to @callback.
*
@@ -912,7 +912,7 @@ g_dbus_address_get_stream_finish (GAsyncResult *res,
* g_dbus_address_get_stream_sync:
* @address: A valid D-Bus address.
* @out_guid: (optional) (out): %NULL or return location to store the GUID extracted from @address, if any.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
* @error: Return location for error or %NULL.
*
* Synchronously connects to an endpoint specified by @address and
@@ -1540,7 +1540,7 @@ get_session_address_platform_specific (GError **error)
/**
* g_dbus_address_get_for_bus_sync:
* @bus_type: a #GBusType
- * @cancellable: (allow-none): a #GCancellable or %NULL
+ * @cancellable: (nullable): a #GCancellable or %NULL
* @error: return location for error or %NULL
*
* Synchronously looks up the D-Bus address for the well-known message
diff --git a/gio/gdbusauthobserver.c b/gio/gdbusauthobserver.c
index ffa3c64..3ae434f 100644
--- a/gio/gdbusauthobserver.c
+++ b/gio/gdbusauthobserver.c
@@ -156,7 +156,7 @@ g_dbus_auth_observer_class_init (GDBusAuthObserverClass *klass)
* GDBusAuthObserver::authorize-authenticated-peer:
* @observer: The #GDBusAuthObserver emitting the signal.
* @stream: A #GIOStream for the #GDBusConnection.
- * @credentials: (allow-none): Credentials received from the peer or %NULL.
+ * @credentials: (nullable): Credentials received from the peer or %NULL.
*
* Emitted to check if a peer that is successfully authenticated
* is authorized.
@@ -228,7 +228,7 @@ g_dbus_auth_observer_new (void)
* g_dbus_auth_observer_authorize_authenticated_peer:
* @observer: A #GDBusAuthObserver.
* @stream: A #GIOStream for the #GDBusConnection.
- * @credentials: (allow-none): Credentials received from the peer or %NULL.
+ * @credentials: (nullable): Credentials received from the peer or %NULL.
*
* Emits the #GDBusAuthObserver::authorize-authenticated-peer signal on @observer.
*
diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c
index 8977c67..8400a64 100644
--- a/gio/gdbusconnection.c
+++ b/gio/gdbusconnection.c
@@ -251,8 +251,8 @@ call_destroy_notify_data_free (CallDestroyNotifyData *data)
/*
* call_destroy_notify: <internal>
- * @context: (allow-none): A #GMainContext or %NULL.
- * @callback: (allow-none): A #GDestroyNotify or %NULL.
+ * @context: (nullable): A #GMainContext or %NULL.
+ * @callback: (nullable): A #GDestroyNotify or %NULL.
* @user_data: Data to pass to @callback.
*
* Schedules @callback to run in @context.
@@ -1026,7 +1026,7 @@ g_dbus_connection_class_init (GDBusConnectionClass *klass)
* @connection: the #GDBusConnection emitting the signal
* @remote_peer_vanished: %TRUE if @connection is closed because the
* remote peer closed its end of the connection
- * @error: (allow-none): a #GError with more details about the event or %NULL
+ * @error: (nullable): a #GError with more details about the event or %NULL
*
* Emitted when the connection is closed.
*
@@ -1217,8 +1217,8 @@ flush_in_thread_func (GTask *task,
/**
* g_dbus_connection_flush:
* @connection: a #GDBusConnection
- * @cancellable: (allow-none): a #GCancellable or %NULL
- * @callback: (allow-none): a #GAsyncReadyCallback to call when the
+ * @cancellable: (nullable): a #GCancellable or %NULL
+ * @callback: (nullable): a #GAsyncReadyCallback to call when the
* request is satisfied or %NULL if you don't care about the result
* @user_data: The data to pass to @callback
*
@@ -1283,7 +1283,7 @@ g_dbus_connection_flush_finish (GDBusConnection *connection,
/**
* g_dbus_connection_flush_sync:
* @connection: a #GDBusConnection
- * @cancellable: (allow-none): a #GCancellable or %NULL
+ * @cancellable: (nullable): a #GCancellable or %NULL
* @error: return location for error or %NULL
*
* Synchronously flushes @connection. The calling thread is blocked
@@ -1398,8 +1398,8 @@ schedule_closed_unlocked (GDBusConnection *connection,
/**
* g_dbus_connection_close:
* @connection: a #GDBusConnection
- * @cancellable: (allow-none): a #GCancellable or %NULL
- * @callback: (allow-none): a #GAsyncReadyCallback to call when the request is
+ * @cancellable: (nullable): a #GCancellable or %NULL
+ * @callback: (nullable): a #GAsyncReadyCallback to call when the request is
* satisfied or %NULL if you don't care about the result
* @user_data: The data to pass to @callback
*
@@ -1497,7 +1497,7 @@ sync_close_cb (GObject *source_object,
/**
* g_dbus_connection_close_sync:
* @connection: a #GDBusConnection
- * @cancellable: (allow-none): a #GCancellable or %NULL
+ * @cancellable: (nullable): a #GCancellable or %NULL
* @error: return location for error or %NULL
*
* Synchronously closees @connection. The calling thread is blocked
@@ -1684,7 +1684,7 @@ g_dbus_connection_send_message_unlocked (GDBusConnection *connection,
* @connection: a #GDBusConnection
* @message: a #GDBusMessage
* @flags: flags affecting how the message is sent
- * @out_serial: (out) (allow-none): return location for serial number assigned
+ * @out_serial: (out) (optional): return location for serial number assigned
* to @message when sending it or %NULL
* @error: Return location for error or %NULL
*
@@ -1952,10 +1952,10 @@ g_dbus_connection_send_message_with_reply_unlocked (GDBusConnection *connect
* @flags: flags affecting how the message is sent
* @timeout_msec: the timeout in milliseconds, -1 to use the default
* timeout or %G_MAXINT for no timeout
- * @out_serial: (out) (allow-none): return location for serial number assigned
+ * @out_serial: (out) (optional): return location for serial number assigned
* to @message when sending it or %NULL
- * @cancellable: (allow-none): a #GCancellable or %NULL
- * @callback: (allow-none): a #GAsyncReadyCallback to call when the request
+ * @cancellable: (nullable): a #GCancellable or %NULL
+ * @callback: (nullable): a #GAsyncReadyCallback to call when the request
* is satisfied or %NULL if you don't care about the result
* @user_data: The data to pass to @callback
*
@@ -2077,9 +2077,9 @@ send_message_with_reply_sync_cb (GDBusConnection *connection,
* @flags: flags affecting how the message is sent.
* @timeout_msec: the timeout in milliseconds, -1 to use the default
* timeout or %G_MAXINT for no timeout
- * @out_serial: (out) (allow-none): return location for serial number
+ * @out_serial: (out) (optional): return location for serial number
* assigned to @message when sending it or %NULL
- * @cancellable: (allow-none): a #GCancellable or %NULL
+ * @cancellable: (nullable): a #GCancellable or %NULL
* @error: return location for error or %NULL
*
* Synchronously sends @message to the peer represented by @connection
@@ -2649,10 +2649,10 @@ async_initable_iface_init (GAsyncInitableIface *async_initable_iface)
/**
* g_dbus_connection_new:
* @stream: a #GIOStream
- * @guid: (allow-none): the GUID to use if a authenticating as a server or %NULL
+ * @guid: (nullable): the GUID to use if a authenticating as a server or %NULL
* @flags: flags describing how to make the connection
- * @observer: (allow-none): a #GDBusAuthObserver or %NULL
- * @cancellable: (allow-none): a #GCancellable or %NULL
+ * @observer: (nullable): a #GDBusAuthObserver or %NULL
+ * @cancellable: (nullable): a #GCancellable or %NULL
* @callback: a #GAsyncReadyCallback to call when the request is satisfied
* @user_data: the data to pass to @callback
*
@@ -2739,10 +2739,10 @@ g_dbus_connection_new_finish (GAsyncResult *res,
/**
* g_dbus_connection_new_sync:
* @stream: a #GIOStream
- * @guid: (allow-none): the GUID to use if a authenticating as a server or %NULL
+ * @guid: (nullable): the GUID to use if a authenticating as a server or %NULL
* @flags: flags describing how to make the connection
- * @observer: (allow-none): a #GDBusAuthObserver or %NULL
- * @cancellable: (allow-none): a #GCancellable or %NULL
+ * @observer: (nullable): a #GDBusAuthObserver or %NULL
+ * @cancellable: (nullable): a #GCancellable or %NULL
* @error: return location for error or %NULL
*
* Synchronously sets up a D-Bus connection for exchanging D-Bus messages
@@ -2791,8 +2791,8 @@ g_dbus_connection_new_sync (GIOStream *stream,
* g_dbus_connection_new_for_address:
* @address: a D-Bus address
* @flags: flags describing how to make the connection
- * @observer: (allow-none): a #GDBusAuthObserver or %NULL
- * @cancellable: (allow-none): a #GCancellable or %NULL
+ * @observer: (nullable): a #GDBusAuthObserver or %NULL
+ * @cancellable: (nullable): a #GCancellable or %NULL
* @callback: a #GAsyncReadyCallback to call when the request is satisfied
* @user_data: the data to pass to @callback
*
@@ -2878,8 +2878,8 @@ g_dbus_connection_new_for_address_finish (GAsyncResult *res,
* g_dbus_connection_new_for_address_sync:
* @address: a D-Bus address
* @flags: flags describing how to make the connection
- * @observer: (allow-none): a #GDBusAuthObserver or %NULL
- * @cancellable: (allow-none): a #GCancellable or %NULL
+ * @observer: (nullable): a #GDBusAuthObserver or %NULL
+ * @cancellable: (nullable): a #GCancellable or %NULL
* @error: return location for error or %NULL
*
* Synchronously connects and sets up a D-Bus client connection for
@@ -3360,21 +3360,21 @@ is_signal_data_for_name_lost_or_acquired (SignalData *signal_data)
/**
* g_dbus_connection_signal_subscribe:
* @connection: a #GDBusConnection
- * @sender: (allow-none): sender name to match on (unique or well-known name)
+ * @sender: (nullable): sender name to match on (unique or well-known name)
* or %NULL to listen from all senders
- * @interface_name: (allow-none): D-Bus interface name to match on or %NULL to
+ * @interface_name: (nullable): D-Bus interface name to match on or %NULL to
* match on all interfaces
- * @member: (allow-none): D-Bus signal name to match on or %NULL to match on
+ * @member: (nullable): D-Bus signal name to match on or %NULL to match on
* all signals
- * @object_path: (allow-none): object path to match on or %NULL to match on
+ * @object_path: (nullable): object path to match on or %NULL to match on
* all object paths
- * @arg0: (allow-none): contents of first string argument to match on or %NULL
+ * @arg0: (nullable): contents of first string argument to match on or %NULL
* to match on all kinds of arguments
* @flags: #GDBusSignalFlags describing how arg0 is used in subscribing to the
* signal
* @callback: callback to invoke when there is a signal matching the requested data
* @user_data: user data to pass to @callback
- * @user_data_free_func: (allow-none): function to free @user_data with when
+ * @user_data_free_func: (nullable): function to free @user_data with when
* subscription is removed or %NULL
*
* Subscribes to signals on @connection and invokes @callback with a whenever
@@ -5057,8 +5057,8 @@ obj_message_func (GDBusConnection *connection,
* @connection: a #GDBusConnection
* @object_path: the object path to register at
* @interface_info: introspection data for the interface
- * @vtable: (allow-none): a #GDBusInterfaceVTable to call into or %NULL
- * @user_data: (allow-none): data to pass to functions in @vtable
+ * @vtable: (nullable): a #GDBusInterfaceVTable to call into or %NULL
+ * @user_data: (nullable): data to pass to functions in @vtable
* @user_data_free_func: function to call when the object path is unregistered
* @error: return location for error or %NULL
*
@@ -5488,12 +5488,12 @@ g_dbus_connection_register_object_with_closures (GDBusConnection *connection
/**
* g_dbus_connection_emit_signal:
* @connection: a #GDBusConnection
- * @destination_bus_name: (allow-none): the unique bus name for the destination
+ * @destination_bus_name: (nullable): the unique bus name for the destination
* for the signal or %NULL to emit to all listeners
* @object_path: path of remote object
* @interface_name: D-Bus interface to emit a signal on
* @signal_name: the name of the signal to emit
- * @parameters: (allow-none): a #GVariant tuple with parameters for the signal
+ * @parameters: (nullable): a #GVariant tuple with parameters for the signal
* or %NULL if not passing parameters
* @error: Return location for error or %NULL
*
@@ -5986,19 +5986,19 @@ g_dbus_connection_call_sync_internal (GDBusConnection *connection,
/**
* g_dbus_connection_call:
* @connection: a #GDBusConnection
- * @bus_name: (allow-none): a unique or well-known bus name or %NULL if
+ * @bus_name: (nullable): a unique or well-known bus name or %NULL if
* @connection is not a message bus connection
* @object_path: path of remote object
* @interface_name: D-Bus interface to invoke method on
* @method_name: the name of the method to invoke
- * @parameters: (allow-none): a #GVariant tuple with parameters for the method
+ * @parameters: (nullable): a #GVariant tuple with parameters for the method
* or %NULL if not passing parameters
- * @reply_type: (allow-none): the expected type of the reply, or %NULL
+ * @reply_type: (nullable): the expected type of the reply, or %NULL
* @flags: flags from the #GDBusCallFlags enumeration
* @timeout_msec: the timeout in milliseconds, -1 to use the default
* timeout or %G_MAXINT for no timeout
- * @cancellable: (allow-none): a #GCancellable or %NULL
- * @callback: (allow-none): a #GAsyncReadyCallback to call when the request
+ * @cancellable: (nullable): a #GCancellable or %NULL
+ * @callback: (nullable): a #GAsyncReadyCallback to call when the request
* is satisfied or %NULL if you don't care about the result of the
* method invocation
* @user_data: the data to pass to @callback
@@ -6090,18 +6090,18 @@ g_dbus_connection_call_finish (GDBusConnection *connection,
/**
* g_dbus_connection_call_sync:
* @connection: a #GDBusConnection
- * @bus_name: (allow-none): a unique or well-known bus name or %NULL if
+ * @bus_name: (nullable): a unique or well-known bus name or %NULL if
* @connection is not a message bus connection
* @object_path: path of remote object
* @interface_name: D-Bus interface to invoke method on
* @method_name: the name of the method to invoke
- * @parameters: (allow-none): a #GVariant tuple with parameters for the method
+ * @parameters: (nullable): a #GVariant tuple with parameters for the method
* or %NULL if not passing parameters
- * @reply_type: (allow-none): the expected type of the reply, or %NULL
+ * @reply_type: (nullable): the expected type of the reply, or %NULL
* @flags: flags from the #GDBusCallFlags enumeration
* @timeout_msec: the timeout in milliseconds, -1 to use the default
* timeout or %G_MAXINT for no timeout
- * @cancellable: (allow-none): a #GCancellable or %NULL
+ * @cancellable: (nullable): a #GCancellable or %NULL
* @error: return location for error or %NULL
*
* Synchronously invokes the @method_name method on the
@@ -6169,20 +6169,20 @@ g_dbus_connection_call_sync (GDBusConnection *connection,
/**
* g_dbus_connection_call_with_unix_fd_list:
* @connection: a #GDBusConnection
- * @bus_name: (allow-none): a unique or well-known bus name or %NULL if
+ * @bus_name: (nullable): a unique or well-known bus name or %NULL if
* @connection is not a message bus connection
* @object_path: path of remote object
* @interface_name: D-Bus interface to invoke method on
* @method_name: the name of the method to invoke
- * @parameters: (allow-none): a #GVariant tuple with parameters for the method
+ * @parameters: (nullable): a #GVariant tuple with parameters for the method
* or %NULL if not passing parameters
- * @reply_type: (allow-none): the expected type of the reply, or %NULL
+ * @reply_type: (nullable): the expected type of the reply, or %NULL
* @flags: flags from the #GDBusCallFlags enumeration
* @timeout_msec: the timeout in milliseconds, -1 to use the default
* timeout or %G_MAXINT for no timeout
- * @fd_list: (allow-none): a #GUnixFDList or %NULL
- * @cancellable: (allow-none): a #GCancellable or %NULL
- * @callback: (allow-none): a #GAsyncReadyCallback to call when the request is
+ * @fd_list: (nullable): a #GUnixFDList or %NULL
+ * @cancellable: (nullable): a #GCancellable or %NULL
+ * @callback: (nullable): a #GAsyncReadyCallback to call when the request is
* satisfied or %NULL if you don't * care about the result of the
* method invocation
* @user_data: The data to pass to @callback.
@@ -6214,7 +6214,7 @@ g_dbus_connection_call_with_unix_fd_list (GDBusConnection *connection,
/**
* g_dbus_connection_call_with_unix_fd_list_finish:
* @connection: a #GDBusConnection
- * @out_fd_list: (out) (allow-none): return location for a #GUnixFDList or %NULL
+ * @out_fd_list: (out) (optional): return location for a #GUnixFDList or %NULL
* @res: a #GAsyncResult obtained from the #GAsyncReadyCallback passed to
* g_dbus_connection_call_with_unix_fd_list()
* @error: return location for error or %NULL
@@ -6238,20 +6238,20 @@ g_dbus_connection_call_with_unix_fd_list_finish (GDBusConnection *connection,
/**
* g_dbus_connection_call_with_unix_fd_list_sync:
* @connection: a #GDBusConnection
- * @bus_name: (allow-none): a unique or well-known bus name or %NULL
+ * @bus_name: (nullable): a unique or well-known bus name or %NULL
* if @connection is not a message bus connection
* @object_path: path of remote object
* @interface_name: D-Bus interface to invoke method on
* @method_name: the name of the method to invoke
- * @parameters: (allow-none): a #GVariant tuple with parameters for
+ * @parameters: (nullable): a #GVariant tuple with parameters for
* the method or %NULL if not passing parameters
- * @reply_type: (allow-none): the expected type of the reply, or %NULL
+ * @reply_type: (nullable): the expected type of the reply, or %NULL
* @flags: flags from the #GDBusCallFlags enumeration
* @timeout_msec: the timeout in milliseconds, -1 to use the default
* timeout or %G_MAXINT for no timeout
- * @fd_list: (allow-none): a #GUnixFDList or %NULL
- * @out_fd_list: (out) (allow-none): return location for a #GUnixFDList or %NULL
- * @cancellable: (allow-none): a #GCancellable or %NULL
+ * @fd_list: (nullable): a #GUnixFDList or %NULL
+ * @out_fd_list: (out) (optional): return location for a #GUnixFDList or %NULL
+ * @cancellable: (nullable): a #GCancellable or %NULL
* @error: return location for error or %NULL
*
* Like g_dbus_connection_call_sync() but also takes and returns #GUnixFDList objects.
@@ -7218,7 +7218,7 @@ _g_bus_get_singleton_if_exists (GBusType bus_type)
/**
* g_bus_get_sync:
* @bus_type: a #GBusType
- * @cancellable: (allow-none): a #GCancellable or %NULL
+ * @cancellable: (nullable): a #GCancellable or %NULL
* @error: return location for error or %NULL
*
* Synchronously connects to the message bus specified by @bus_type.
@@ -7292,7 +7292,7 @@ bus_get_async_initable_cb (GObject *source_object,
/**
* g_bus_get:
* @bus_type: a #GBusType
- * @cancellable: (allow-none): a #GCancellable or %NULL
+ * @cancellable: (nullable): a #GCancellable or %NULL
* @callback: a #GAsyncReadyCallback to call when the request is satisfied
* @user_data: the data to pass to @callback
*
diff --git a/gio/gdbusconnection.h b/gio/gdbusconnection.h
index abc8777..0e61885 100644
--- a/gio/gdbusconnection.h
+++ b/gio/gdbusconnection.h
@@ -652,7 +652,7 @@ void g_dbus_connection_signal_unsubscribe (GDBusConnection
* check this ahead of time using g_dbus_message_to_blob() passing a
* #GDBusCapabilityFlags value obtained from @connection.
*
- * Returns: (transfer full) (allow-none): A #GDBusMessage that will be freed with
+ * Returns: (transfer full) (nullable): A #GDBusMessage that will be freed with
* g_object_unref() or %NULL to drop the message. Passive filter
* functions can simply return the passed @message object.
*
diff --git a/gio/gdbuserror.c b/gio/gdbuserror.c
index 8dd4b71..dd7ab21 100644
--- a/gio/gdbuserror.c
+++ b/gio/gdbuserror.c
@@ -659,7 +659,7 @@ g_dbus_error_new_for_dbus_error (const gchar *dbus_error_name,
* @error: A pointer to a #GError or %NULL.
* @dbus_error_name: D-Bus error name.
* @dbus_error_message: D-Bus error message.
- * @format: (allow-none): printf()-style format to prepend to @dbus_error_message or %NULL.
+ * @format: (nullable): printf()-style format to prepend to @dbus_error_message or %NULL.
* @...: Arguments for @format.
*
* Does nothing if @error is %NULL. Otherwise sets *@error to
@@ -704,7 +704,7 @@ g_dbus_error_set_dbus_error (GError **error,
* @error: A pointer to a #GError or %NULL.
* @dbus_error_name: D-Bus error name.
* @dbus_error_message: D-Bus error message.
- * @format: (allow-none): printf()-style format to prepend to @dbus_error_message or %NULL.
+ * @format: (nullable): printf()-style format to prepend to @dbus_error_message or %NULL.
* @var_args: Arguments for @format.
*
* Like g_dbus_error_set_dbus_error() but intended for language bindings.
diff --git a/gio/gdbusinterface.c b/gio/gdbusinterface.c
index 4f1ce3f..65eb4e0 100644
--- a/gio/gdbusinterface.c
+++ b/gio/gdbusinterface.c
@@ -119,7 +119,7 @@ g_dbus_interface_dup_object (GDBusInterface *interface_)
/**
* g_dbus_interface_set_object:
* @interface_: An exported D-Bus interface.
- * @object: (allow-none): A #GDBusObject or %NULL.
+ * @object: (nullable): A #GDBusObject or %NULL.
*
* Sets the #GDBusObject for @interface_ to @object.
*
diff --git a/gio/gdbusintrospection.c b/gio/gdbusintrospection.c
index 6d3ff93..bb51090 100644
--- a/gio/gdbusintrospection.c
+++ b/gio/gdbusintrospection.c
@@ -1838,7 +1838,7 @@ g_dbus_node_info_new_for_xml (const gchar *xml_data,
/**
* g_dbus_annotation_info_lookup:
- * @annotations: (array zero-terminated=1) (allow-none): A %NULL-terminated array of annotations or %NULL.
+ * @annotations: (array zero-terminated=1) (nullable): A %NULL-terminated array of annotations or %NULL.
* @name: The name of the annotation to look up.
*
* Looks up the value of an annotation.
diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c
index 6b3ca77..94b75ff 100644
--- a/gio/gdbusmessage.c
+++ b/gio/gdbusmessage.c
@@ -580,9 +580,9 @@ g_dbus_message_new (void)
/**
* g_dbus_message_new_method_call:
- * @name: (allow-none): A valid D-Bus name or %NULL.
+ * @name: (nullable): A valid D-Bus name or %NULL.
* @path: A valid object path.
- * @interface_: (allow-none): A valid D-Bus interface name or %NULL.
+ * @interface_: (nullable): A valid D-Bus interface name or %NULL.
* @method: A valid method name.
*
* Creates a new #GDBusMessage for a method call.
@@ -999,7 +999,7 @@ g_dbus_message_get_header (GDBusMessage *message,
* g_dbus_message_set_header:
* @message: A #GDBusMessage.
* @header_field: A 8-bit unsigned integer (typically a value from the #GDBusMessageHeaderField enumeration)
- * @value: (allow-none): A #GVariant to set the header field or %NULL to clear the header field.
+ * @value: (nullable): A #GVariant to set the header field or %NULL to clear the header field.
*
* Sets a header field on @message.
*
@@ -1162,7 +1162,7 @@ g_dbus_message_get_unix_fd_list (GDBusMessage *message)
/**
* g_dbus_message_set_unix_fd_list:
* @message: A #GDBusMessage.
- * @fd_list: (allow-none): A #GUnixFDList or %NULL.
+ * @fd_list: (nullable): A #GUnixFDList or %NULL.
*
* Sets the UNIX file descriptors associated with @message. As a
* side-effect the %G_DBUS_MESSAGE_HEADER_FIELD_NUM_UNIX_FDS header
diff --git a/gio/gdbusmethodinvocation.c b/gio/gdbusmethodinvocation.c
index 6fdcd6d..d111394 100644
--- a/gio/gdbusmethodinvocation.c
+++ b/gio/gdbusmethodinvocation.c
@@ -325,12 +325,12 @@ g_dbus_method_invocation_get_user_data (GDBusMethodInvocation *invocation)
/* < internal >
* _g_dbus_method_invocation_new:
- * @sender: (allow-none): The bus name that invoked the method or %NULL if @connection is not a bus
connection.
+ * @sender: (nullable): The bus name that invoked the method or %NULL if @connection is not a bus connection.
* @object_path: The object path the method was invoked on.
* @interface_name: The name of the D-Bus interface the method was invoked on.
* @method_name: The name of the method that was invoked.
- * @method_info: (allow-none): Information about the method call or %NULL.
- * @property_info: (allow-none): Information about the property or %NULL.
+ * @method_info: (nullable): Information about the method call or %NULL.
+ * @property_info: (nullable): Information about the property or %NULL.
* @connection: The #GDBusConnection the method was invoked on.
* @message: The D-Bus message as a #GDBusMessage.
* @parameters: The parameters as a #GVariant tuple.
@@ -529,7 +529,7 @@ g_dbus_method_invocation_return_value_internal (GDBusMethodInvocation *invocatio
/**
* g_dbus_method_invocation_return_value:
* @invocation: (transfer full): A #GDBusMethodInvocation.
- * @parameters: (allow-none): A #GVariant tuple with out parameters for the method or %NULL if not passing
any parameters.
+ * @parameters: (nullable): A #GVariant tuple with out parameters for the method or %NULL if not passing any
parameters.
*
* Finishes handling a D-Bus method call by returning @parameters.
* If the @parameters GVariant is floating, it is consumed.
@@ -558,8 +558,8 @@ g_dbus_method_invocation_return_value (GDBusMethodInvocation *invocation,
/**
* g_dbus_method_invocation_return_value_with_unix_fd_list:
* @invocation: (transfer full): A #GDBusMethodInvocation.
- * @parameters: (allow-none): A #GVariant tuple with out parameters for the method or %NULL if not passing
any parameters.
- * @fd_list: (allow-none): A #GUnixFDList or %NULL.
+ * @parameters: (nullable): A #GVariant tuple with out parameters for the method or %NULL if not passing any
parameters.
+ * @fd_list: (nullable): A #GUnixFDList or %NULL.
*
* Like g_dbus_method_invocation_return_value() but also takes a #GUnixFDList.
*
diff --git a/gio/gdbusnameowning.c b/gio/gdbusnameowning.c
index 00b2dfd..c95e434 100644
--- a/gio/gdbusnameowning.c
+++ b/gio/gdbusnameowning.c
@@ -495,10 +495,10 @@ connection_get_cb (GObject *source_object,
* @connection: a #GDBusConnection
* @name: the well-known name to own
* @flags: a set of flags from the #GBusNameOwnerFlags enumeration
- * @name_acquired_handler: (allow-none): handler to invoke when @name is acquired or %NULL
- * @name_lost_handler: (allow-none): handler to invoke when @name is lost or %NULL
+ * @name_acquired_handler: (nullable): handler to invoke when @name is acquired or %NULL
+ * @name_lost_handler: (nullable): handler to invoke when @name is lost or %NULL
* @user_data: user data to pass to handlers
- * @user_data_free_func: (allow-none): function for freeing @user_data or %NULL
+ * @user_data_free_func: (nullable): function for freeing @user_data or %NULL
*
* Like g_bus_own_name() but takes a #GDBusConnection instead of a
* #GBusType.
@@ -557,11 +557,11 @@ g_bus_own_name_on_connection (GDBusConnection *connection,
* @bus_type: the type of bus to own a name on
* @name: the well-known name to own
* @flags: a set of flags from the #GBusNameOwnerFlags enumeration
- * @bus_acquired_handler: (allow-none): handler to invoke when connected to the bus of type @bus_type or
%NULL
- * @name_acquired_handler: (allow-none): handler to invoke when @name is acquired or %NULL
- * @name_lost_handler: (allow-none): handler to invoke when @name is lost or %NULL
+ * @bus_acquired_handler: (nullable): handler to invoke when connected to the bus of type @bus_type or %NULL
+ * @name_acquired_handler: (nullable): handler to invoke when @name is acquired or %NULL
+ * @name_lost_handler: (nullable): handler to invoke when @name is lost or %NULL
* @user_data: user data to pass to handlers
- * @user_data_free_func: (allow-none): function for freeing @user_data or %NULL
+ * @user_data_free_func: (nullable): function for freeing @user_data or %NULL
*
* Starts acquiring @name on the bus specified by @bus_type and calls
* @name_acquired_handler and @name_lost_handler when the name is
@@ -788,11 +788,11 @@ bus_own_name_free_func (gpointer user_data)
* @bus_type: the type of bus to own a name on
* @name: the well-known name to own
* @flags: a set of flags from the #GBusNameOwnerFlags enumeration
- * @bus_acquired_closure: (allow-none): #GClosure to invoke when connected to
+ * @bus_acquired_closure: (nullable): #GClosure to invoke when connected to
* the bus of type @bus_type or %NULL
- * @name_acquired_closure: (allow-none): #GClosure to invoke when @name is
+ * @name_acquired_closure: (nullable): #GClosure to invoke when @name is
* acquired or %NULL
- * @name_lost_closure: (allow-none): #GClosure to invoke when @name is lost or
+ * @name_lost_closure: (nullable): #GClosure to invoke when @name is lost or
* %NULL
*
* Version of g_bus_own_name() using closures instead of callbacks for
@@ -828,9 +828,9 @@ g_bus_own_name_with_closures (GBusType bus_type,
* @connection: a #GDBusConnection
* @name: the well-known name to own
* @flags: a set of flags from the #GBusNameOwnerFlags enumeration
- * @name_acquired_closure: (allow-none): #GClosure to invoke when @name is
+ * @name_acquired_closure: (nullable): #GClosure to invoke when @name is
* acquired or %NULL
- * @name_lost_closure: (allow-none): #GClosure to invoke when @name is lost
+ * @name_lost_closure: (nullable): #GClosure to invoke when @name is lost
* or %NULL
*
* Version of g_bus_own_name_on_connection() using closures instead of
diff --git a/gio/gdbusnamewatching.c b/gio/gdbusnamewatching.c
index 07713db..01ab4ce 100644
--- a/gio/gdbusnamewatching.c
+++ b/gio/gdbusnamewatching.c
@@ -505,10 +505,10 @@ connection_get_cb (GObject *source_object,
* @bus_type: The type of bus to watch a name on.
* @name: The name (well-known or unique) to watch.
* @flags: Flags from the #GBusNameWatcherFlags enumeration.
- * @name_appeared_handler: (allow-none): Handler to invoke when @name is known to exist or %NULL.
- * @name_vanished_handler: (allow-none): Handler to invoke when @name is known to not exist or %NULL.
+ * @name_appeared_handler: (nullable): Handler to invoke when @name is known to exist or %NULL.
+ * @name_vanished_handler: (nullable): Handler to invoke when @name is known to not exist or %NULL.
* @user_data: User data to pass to handlers.
- * @user_data_free_func: (allow-none): Function for freeing @user_data or %NULL.
+ * @user_data_free_func: (nullable): Function for freeing @user_data or %NULL.
*
* Starts watching @name on the bus specified by @bus_type and calls
* @name_appeared_handler and @name_vanished_handler when the name is
@@ -594,10 +594,10 @@ g_bus_watch_name (GBusType bus_type,
* @connection: A #GDBusConnection.
* @name: The name (well-known or unique) to watch.
* @flags: Flags from the #GBusNameWatcherFlags enumeration.
- * @name_appeared_handler: (allow-none): Handler to invoke when @name is known to exist or %NULL.
- * @name_vanished_handler: (allow-none): Handler to invoke when @name is known to not exist or %NULL.
+ * @name_appeared_handler: (nullable): Handler to invoke when @name is known to exist or %NULL.
+ * @name_vanished_handler: (nullable): Handler to invoke when @name is known to not exist or %NULL.
* @user_data: User data to pass to handlers.
- * @user_data_free_func: (allow-none): Function for freeing @user_data or %NULL.
+ * @user_data_free_func: (nullable): Function for freeing @user_data or %NULL.
*
* Like g_bus_watch_name() but takes a #GDBusConnection instead of a
* #GBusType.
@@ -744,9 +744,9 @@ bus_watch_name_free_func (gpointer user_data)
* @bus_type: The type of bus to watch a name on.
* @name: The name (well-known or unique) to watch.
* @flags: Flags from the #GBusNameWatcherFlags enumeration.
- * @name_appeared_closure: (allow-none): #GClosure to invoke when @name is known
+ * @name_appeared_closure: (nullable): #GClosure to invoke when @name is known
* to exist or %NULL.
- * @name_vanished_closure: (allow-none): #GClosure to invoke when @name is known
+ * @name_vanished_closure: (nullable): #GClosure to invoke when @name is known
* to not exist or %NULL.
*
* Version of g_bus_watch_name() using closures instead of callbacks for
@@ -778,9 +778,9 @@ g_bus_watch_name_with_closures (GBusType bus_type,
* @connection: A #GDBusConnection.
* @name: The name (well-known or unique) to watch.
* @flags: Flags from the #GBusNameWatcherFlags enumeration.
- * @name_appeared_closure: (allow-none): #GClosure to invoke when @name is known
+ * @name_appeared_closure: (nullable): #GClosure to invoke when @name is known
* to exist or %NULL.
- * @name_vanished_closure: (allow-none): #GClosure to invoke when @name is known
+ * @name_vanished_closure: (nullable): #GClosure to invoke when @name is known
* to not exist or %NULL.
*
* Version of g_bus_watch_name_on_connection() using closures instead of callbacks for
diff --git a/gio/gdbusobjectmanagerclient.c b/gio/gdbusobjectmanagerclient.c
index 29bb1db..a94d2f3 100644
--- a/gio/gdbusobjectmanagerclient.c
+++ b/gio/gdbusobjectmanagerclient.c
@@ -581,12 +581,12 @@ g_dbus_object_manager_client_init (GDBusObjectManagerClient *manager)
* g_dbus_object_manager_client_new_sync:
* @connection: A #GDBusConnection.
* @flags: Zero or more flags from the #GDBusObjectManagerClientFlags enumeration.
- * @name: (allow-none): The owner of the control object (unique or well-known name), or %NULL when not using
a message bus connection.
+ * @name: (nullable): The owner of the control object (unique or well-known name), or %NULL when not using a
message bus connection.
* @object_path: The object path of the control object.
- * @get_proxy_type_func: (allow-none): A #GDBusProxyTypeFunc function or %NULL to always construct
#GDBusProxy proxies.
+ * @get_proxy_type_func: (nullable): A #GDBusProxyTypeFunc function or %NULL to always construct #GDBusProxy
proxies.
* @get_proxy_type_user_data: User data to pass to @get_proxy_type_func.
- * @get_proxy_type_destroy_notify: (allow-none): Free function for @get_proxy_type_user_data or %NULL.
- * @cancellable: (allow-none): A #GCancellable or %NULL
+ * @get_proxy_type_destroy_notify: (nullable): Free function for @get_proxy_type_user_data or %NULL.
+ * @cancellable: (nullable): A #GCancellable or %NULL
* @error: Return location for error or %NULL.
*
* Creates a new #GDBusObjectManagerClient object.
@@ -643,10 +643,10 @@ g_dbus_object_manager_client_new_sync (GDBusConnection *connection
* @flags: Zero or more flags from the #GDBusObjectManagerClientFlags enumeration.
* @name: The owner of the control object (unique or well-known name).
* @object_path: The object path of the control object.
- * @get_proxy_type_func: (allow-none): A #GDBusProxyTypeFunc function or %NULL to always construct
#GDBusProxy proxies.
+ * @get_proxy_type_func: (nullable): A #GDBusProxyTypeFunc function or %NULL to always construct #GDBusProxy
proxies.
* @get_proxy_type_user_data: User data to pass to @get_proxy_type_func.
- * @get_proxy_type_destroy_notify: (allow-none): Free function for @get_proxy_type_user_data or %NULL.
- * @cancellable: (allow-none): A #GCancellable or %NULL
+ * @get_proxy_type_destroy_notify: (nullable): Free function for @get_proxy_type_user_data or %NULL.
+ * @cancellable: (nullable): A #GCancellable or %NULL
* @callback: A #GAsyncReadyCallback to call when the request is satisfied.
* @user_data: The data to pass to @callback.
*
@@ -735,10 +735,10 @@ g_dbus_object_manager_client_new_finish (GAsyncResult *res,
* @flags: Zero or more flags from the #GDBusObjectManagerClientFlags enumeration.
* @name: The owner of the control object (unique or well-known name).
* @object_path: The object path of the control object.
- * @get_proxy_type_func: (allow-none): A #GDBusProxyTypeFunc function or %NULL to always construct
#GDBusProxy proxies.
+ * @get_proxy_type_func: (nullable): A #GDBusProxyTypeFunc function or %NULL to always construct #GDBusProxy
proxies.
* @get_proxy_type_user_data: User data to pass to @get_proxy_type_func.
- * @get_proxy_type_destroy_notify: (allow-none): Free function for @get_proxy_type_user_data or %NULL.
- * @cancellable: (allow-none): A #GCancellable or %NULL
+ * @get_proxy_type_destroy_notify: (nullable): Free function for @get_proxy_type_user_data or %NULL.
+ * @cancellable: (nullable): A #GCancellable or %NULL
* @error: Return location for error or %NULL.
*
* Like g_dbus_object_manager_client_new_sync() but takes a #GBusType instead
@@ -795,10 +795,10 @@ g_dbus_object_manager_client_new_for_bus_sync (GBusType bu
* @flags: Zero or more flags from the #GDBusObjectManagerClientFlags enumeration.
* @name: The owner of the control object (unique or well-known name).
* @object_path: The object path of the control object.
- * @get_proxy_type_func: (allow-none): A #GDBusProxyTypeFunc function or %NULL to always construct
#GDBusProxy proxies.
+ * @get_proxy_type_func: (nullable): A #GDBusProxyTypeFunc function or %NULL to always construct #GDBusProxy
proxies.
* @get_proxy_type_user_data: User data to pass to @get_proxy_type_func.
- * @get_proxy_type_destroy_notify: (allow-none): Free function for @get_proxy_type_user_data or %NULL.
- * @cancellable: (allow-none): A #GCancellable or %NULL
+ * @get_proxy_type_destroy_notify: (nullable): Free function for @get_proxy_type_user_data or %NULL.
+ * @cancellable: (nullable): A #GCancellable or %NULL
* @callback: A #GAsyncReadyCallback to call when the request is satisfied.
* @user_data: The data to pass to @callback.
*
diff --git a/gio/gdbusobjectmanagerserver.c b/gio/gdbusobjectmanagerserver.c
index 6aefb58..31bfa85 100644
--- a/gio/gdbusobjectmanagerserver.c
+++ b/gio/gdbusobjectmanagerserver.c
@@ -274,7 +274,7 @@ g_dbus_object_manager_server_new (const gchar *object_path)
/**
* g_dbus_object_manager_server_set_connection:
* @manager: A #GDBusObjectManagerServer.
- * @connection: (allow-none): A #GDBusConnection or %NULL.
+ * @connection: (nullable): A #GDBusConnection or %NULL.
*
* Exports all objects managed by @manager on @connection. If
* @connection is %NULL, stops exporting objects.
diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
index 840a554..c7b126e 100644
--- a/gio/gdbusprivate.c
+++ b/gio/gdbusprivate.c
@@ -1521,9 +1521,9 @@ continue_writing_in_idle_cb (gpointer user_data)
}
/*
- * @write_data: (transfer full) (allow-none):
- * @flush_data: (transfer full) (allow-none):
- * @close_data: (transfer full) (allow-none):
+ * @write_data: (transfer full) (nullable):
+ * @flush_data: (transfer full) (nullable):
+ * @close_data: (transfer full) (nullable):
*
* Can be called from any thread
*
diff --git a/gio/gdbusproxy.c b/gio/gdbusproxy.c
index d98ffec..8676600 100644
--- a/gio/gdbusproxy.c
+++ b/gio/gdbusproxy.c
@@ -605,7 +605,7 @@ g_dbus_proxy_class_init (GDBusProxyClass *klass)
/**
* GDBusProxy::g-signal:
* @proxy: The #GDBusProxy emitting the signal.
- * @sender_name: (allow-none): The sender of the signal or %NULL if the connection is not a bus connection.
+ * @sender_name: (nullable): The sender of the signal or %NULL if the connection is not a bus connection.
* @signal_name: The name of the signal.
* @parameters: A #GVariant tuple with parameters for the signal.
*
@@ -772,7 +772,7 @@ g_dbus_proxy_get_cached_property (GDBusProxy *proxy,
* g_dbus_proxy_set_cached_property:
* @proxy: A #GDBusProxy
* @property_name: Property name.
- * @value: (allow-none): Value for the property or %NULL to remove it from the cache.
+ * @value: (nullable): Value for the property or %NULL to remove it from the cache.
*
* If @value is not %NULL, sets the cached value for the property with
* name @property_name to the value in @value.
@@ -1976,11 +1976,11 @@ initable_iface_init (GInitableIface *initable_iface)
* g_dbus_proxy_new:
* @connection: A #GDBusConnection.
* @flags: Flags used when constructing the proxy.
- * @info: (allow-none): A #GDBusInterfaceInfo specifying the minimal interface that @proxy conforms to or
%NULL.
- * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus
connection.
+ * @info: (nullable): A #GDBusInterfaceInfo specifying the minimal interface that @proxy conforms to or
%NULL.
+ * @name: (nullable): A bus name (well-known or unique) or %NULL if @connection is not a message bus
connection.
* @object_path: An object path.
* @interface_name: A D-Bus interface name.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
* @callback: Callback function to invoke when the proxy is ready.
* @user_data: User data to pass to @callback.
*
@@ -2076,12 +2076,12 @@ g_dbus_proxy_new_finish (GAsyncResult *res,
* g_dbus_proxy_new_sync:
* @connection: A #GDBusConnection.
* @flags: Flags used when constructing the proxy.
- * @info: (allow-none): A #GDBusInterfaceInfo specifying the minimal interface that @proxy conforms to or
%NULL.
- * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus
connection.
+ * @info: (nullable): A #GDBusInterfaceInfo specifying the minimal interface that @proxy conforms to or
%NULL.
+ * @name: (nullable): A bus name (well-known or unique) or %NULL if @connection is not a message bus
connection.
* @object_path: An object path.
* @interface_name: A D-Bus interface name.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: (allow-none): Return location for error or %NULL.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
+ * @error: (nullable): Return location for error or %NULL.
*
* Creates a proxy for accessing @interface_name on the remote object
* at @object_path owned by @name at @connection and synchronously
@@ -2146,11 +2146,11 @@ g_dbus_proxy_new_sync (GDBusConnection *connection,
* g_dbus_proxy_new_for_bus:
* @bus_type: A #GBusType.
* @flags: Flags used when constructing the proxy.
- * @info: (allow-none): A #GDBusInterfaceInfo specifying the minimal interface that @proxy conforms to or
%NULL.
+ * @info: (nullable): A #GDBusInterfaceInfo specifying the minimal interface that @proxy conforms to or
%NULL.
* @name: A bus name (well-known or unique).
* @object_path: An object path.
* @interface_name: A D-Bus interface name.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
* @callback: Callback function to invoke when the proxy is ready.
* @user_data: User data to pass to @callback.
*
@@ -2211,12 +2211,12 @@ g_dbus_proxy_new_for_bus_finish (GAsyncResult *res,
* g_dbus_proxy_new_for_bus_sync:
* @bus_type: A #GBusType.
* @flags: Flags used when constructing the proxy.
- * @info: (allow-none): A #GDBusInterfaceInfo specifying the minimal interface
+ * @info: (nullable): A #GDBusInterfaceInfo specifying the minimal interface
* that @proxy conforms to or %NULL.
* @name: A bus name (well-known or unique).
* @object_path: An object path.
* @interface_name: A D-Bus interface name.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
* @error: Return location for error or %NULL.
*
* Like g_dbus_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection.
@@ -2466,7 +2466,7 @@ g_dbus_proxy_get_interface_info (GDBusProxy *proxy)
/**
* g_dbus_proxy_set_interface_info:
* @proxy: A #GDBusProxy
- * @info: (allow-none): Minimum interface this proxy conforms to or %NULL to unset.
+ * @info: (nullable): Minimum interface this proxy conforms to or %NULL to unset.
*
* Ensure that interactions with @proxy conform to the given
* interface. See the #GDBusProxy:g-interface-info property for more
@@ -2897,12 +2897,12 @@ g_dbus_proxy_call_sync_internal (GDBusProxy *proxy,
* g_dbus_proxy_call:
* @proxy: A #GDBusProxy.
* @method_name: Name of method to invoke.
- * @parameters: (allow-none): A #GVariant tuple with parameters for the signal or %NULL if not passing
parameters.
+ * @parameters: (nullable): A #GVariant tuple with parameters for the signal or %NULL if not passing
parameters.
* @flags: Flags from the #GDBusCallFlags enumeration.
* @timeout_msec: The timeout in milliseconds (with %G_MAXINT meaning
* "infinite") or -1 to use the proxy default timeout.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: (allow-none): A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you
don't
+ * @cancellable: (nullable): A #GCancellable or %NULL.
+ * @callback: (nullable): A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't
* care about the result of the method invocation.
* @user_data: The data to pass to @callback.
*
@@ -2989,12 +2989,12 @@ g_dbus_proxy_call_finish (GDBusProxy *proxy,
* g_dbus_proxy_call_sync:
* @proxy: A #GDBusProxy.
* @method_name: Name of method to invoke.
- * @parameters: (allow-none): A #GVariant tuple with parameters for the signal
+ * @parameters: (nullable): A #GVariant tuple with parameters for the signal
* or %NULL if not passing parameters.
* @flags: Flags from the #GDBusCallFlags enumeration.
* @timeout_msec: The timeout in milliseconds (with %G_MAXINT meaning
* "infinite") or -1 to use the proxy default timeout.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
* @error: Return location for error or %NULL.
*
* Synchronously invokes the @method_name method on @proxy.
@@ -3057,13 +3057,13 @@ g_dbus_proxy_call_sync (GDBusProxy *proxy,
* g_dbus_proxy_call_with_unix_fd_list:
* @proxy: A #GDBusProxy.
* @method_name: Name of method to invoke.
- * @parameters: (allow-none): A #GVariant tuple with parameters for the signal or %NULL if not passing
parameters.
+ * @parameters: (nullable): A #GVariant tuple with parameters for the signal or %NULL if not passing
parameters.
* @flags: Flags from the #GDBusCallFlags enumeration.
* @timeout_msec: The timeout in milliseconds (with %G_MAXINT meaning
* "infinite") or -1 to use the proxy default timeout.
- * @fd_list: (allow-none): A #GUnixFDList or %NULL.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: (allow-none): A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you
don't
+ * @fd_list: (nullable): A #GUnixFDList or %NULL.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
+ * @callback: (nullable): A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't
* care about the result of the method invocation.
* @user_data: The data to pass to @callback.
*
@@ -3090,7 +3090,7 @@ g_dbus_proxy_call_with_unix_fd_list (GDBusProxy *proxy,
/**
* g_dbus_proxy_call_with_unix_fd_list_finish:
* @proxy: A #GDBusProxy.
- * @out_fd_list: (out) (allow-none): Return location for a #GUnixFDList or %NULL.
+ * @out_fd_list: (out) (optional): Return location for a #GUnixFDList or %NULL.
* @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to
g_dbus_proxy_call_with_unix_fd_list().
* @error: Return location for error or %NULL.
*
@@ -3114,14 +3114,14 @@ g_dbus_proxy_call_with_unix_fd_list_finish (GDBusProxy *proxy,
* g_dbus_proxy_call_with_unix_fd_list_sync:
* @proxy: A #GDBusProxy.
* @method_name: Name of method to invoke.
- * @parameters: (allow-none): A #GVariant tuple with parameters for the signal
+ * @parameters: (nullable): A #GVariant tuple with parameters for the signal
* or %NULL if not passing parameters.
* @flags: Flags from the #GDBusCallFlags enumeration.
* @timeout_msec: The timeout in milliseconds (with %G_MAXINT meaning
* "infinite") or -1 to use the proxy default timeout.
- * @fd_list: (allow-none): A #GUnixFDList or %NULL.
- * @out_fd_list: (out) (allow-none): Return location for a #GUnixFDList or %NULL.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @fd_list: (nullable): A #GUnixFDList or %NULL.
+ * @out_fd_list: (out) (optional): Return location for a #GUnixFDList or %NULL.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
* @error: Return location for error or %NULL.
*
* Like g_dbus_proxy_call_sync() but also takes and returns #GUnixFDList objects.
diff --git a/gio/gdbusserver.c b/gio/gdbusserver.c
index d23711f..6a84e75 100644
--- a/gio/gdbusserver.c
+++ b/gio/gdbusserver.c
@@ -448,8 +448,8 @@ on_run (GSocketService *service,
* @address: A D-Bus address.
* @flags: Flags from the #GDBusServerFlags enumeration.
* @guid: A D-Bus GUID.
- * @observer: (allow-none): A #GDBusAuthObserver or %NULL.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @observer: (nullable): A #GDBusAuthObserver or %NULL.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
* @error: Return location for server or %NULL.
*
* Creates a new D-Bus server that listens on the first address in
diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
index fe9d71a..4668ea7 100644
--- a/gio/gdesktopappinfo.c
+++ b/gio/gdesktopappinfo.c
@@ -2971,13 +2971,13 @@ g_desktop_app_info_launch (GAppInfo *appinfo,
* g_desktop_app_info_launch_uris_as_manager:
* @appinfo: a #GDesktopAppInfo
* @uris: (element-type utf8): List of URIs
- * @launch_context: (allow-none): a #GAppLaunchContext
+ * @launch_context: (nullable): a #GAppLaunchContext
* @spawn_flags: #GSpawnFlags, used for each process
- * @user_setup: (scope call) (allow-none): a #GSpawnChildSetupFunc, used once
+ * @user_setup: (scope call) (nullable): a #GSpawnChildSetupFunc, used once
* for each process.
- * @user_setup_data: (closure user_setup) (allow-none): User data for @user_setup
- * @pid_callback: (scope call) (allow-none): Callback for child processes
- * @pid_callback_data: (closure pid_callback) (allow-none): User data for @callback
+ * @user_setup_data: (closure user_setup) (nullable): User data for @user_setup
+ * @pid_callback: (scope call) (nullable): Callback for child processes
+ * @pid_callback_data: (closure pid_callback) (nullable): User data for @callback
* @error: return location for a #GError, or %NULL
*
* This function performs the equivalent of g_app_info_launch_uris(),
@@ -3677,7 +3677,7 @@ g_desktop_app_info_delete (GAppInfo *appinfo)
/**
* g_app_info_create_from_commandline:
* @commandline: the commandline to use
- * @application_name: (allow-none): the application name, or %NULL to use @commandline
+ * @application_name: (nullable): the application name, or %NULL to use @commandline
* @flags: flags that can specify details of the created #GAppInfo
* @error: a #GError location to store the error occurring, %NULL to ignore.
*
@@ -4508,7 +4508,7 @@ g_desktop_app_info_get_action_name (GDesktopAppInfo *info,
* @info: a #GDesktopAppInfo
* @action_name: the name of the action as from
* g_desktop_app_info_list_actions()
- * @launch_context: (allow-none): a #GAppLaunchContext
+ * @launch_context: (nullable): a #GAppLaunchContext
*
* Activates the named application action.
*
diff --git a/gio/gdrive.c b/gio/gdrive.c
index f69bc61..9720bf4 100644
--- a/gio/gdrive.c
+++ b/gio/gdrive.c
@@ -384,8 +384,8 @@ g_drive_can_poll_for_media (GDrive *drive)
* g_drive_eject:
* @drive: a #GDrive.
* @flags: flags affecting the unmount if required for eject
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
+ * @callback: (nullable): a #GAsyncReadyCallback, or %NULL.
* @user_data: user data to pass to @callback
*
* Asynchronously ejects a drive.
@@ -458,10 +458,10 @@ g_drive_eject_finish (GDrive *drive,
* g_drive_eject_with_operation:
* @drive: a #GDrive.
* @flags: flags affecting the unmount if required for eject
- * @mount_operation: (allow-none): a #GMountOperation or %NULL to avoid
+ * @mount_operation: (nullable): a #GMountOperation or %NULL to avoid
* user interaction.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
+ * @callback: (nullable): a #GAsyncReadyCallback, or %NULL.
* @user_data: user data passed to @callback.
*
* Ejects a drive. This is an asynchronous operation, and is
@@ -541,8 +541,8 @@ g_drive_eject_with_operation_finish (GDrive *drive,
/**
* g_drive_poll_for_media:
* @drive: a #GDrive.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
+ * @callback: (nullable): a #GAsyncReadyCallback, or %NULL.
* @user_data: user data to pass to @callback
*
* Asynchronously polls @drive to see if media has been inserted or removed.
@@ -740,10 +740,10 @@ g_drive_can_start_degraded (GDrive *drive)
* g_drive_start:
* @drive: a #GDrive.
* @flags: flags affecting the start operation.
- * @mount_operation: (allow-none): a #GMountOperation or %NULL to avoid
+ * @mount_operation: (nullable): a #GMountOperation or %NULL to avoid
* user interaction.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
+ * @callback: (nullable): a #GAsyncReadyCallback, or %NULL.
* @user_data: user data to pass to @callback
*
* Asynchronously starts a drive.
@@ -842,10 +842,10 @@ g_drive_can_stop (GDrive *drive)
* g_drive_stop:
* @drive: a #GDrive.
* @flags: flags affecting the unmount if required for stopping.
- * @mount_operation: (allow-none): a #GMountOperation or %NULL to avoid
+ * @mount_operation: (nullable): a #GMountOperation or %NULL to avoid
* user interaction.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
+ * @callback: (nullable): a #GAsyncReadyCallback, or %NULL.
* @user_data: user data to pass to @callback
*
* Asynchronously stops a drive.
diff --git a/gio/gdtlsclientconnection.c b/gio/gdtlsclientconnection.c
index 70d9a51..5e992d2 100644
--- a/gio/gdtlsclientconnection.c
+++ b/gio/gdtlsclientconnection.c
@@ -128,7 +128,7 @@ g_dtls_client_connection_default_init (GDtlsClientConnectionInterface *iface)
/**
* g_dtls_client_connection_new:
* @base_socket: the #GDatagramBased to wrap
- * @server_identity: (allow-none): the expected identity of the server
+ * @server_identity: (nullable): the expected identity of the server
* @error: #GError for error reporting, or %NULL to ignore.
*
* Creates a new #GDtlsClientConnection wrapping @base_socket which is
diff --git a/gio/gdtlsconnection.c b/gio/gdtlsconnection.c
index cfa2826..ef9127c 100644
--- a/gio/gdtlsconnection.c
+++ b/gio/gdtlsconnection.c
@@ -405,7 +405,7 @@ g_dtls_connection_get_certificate (GDtlsConnection *conn)
/**
* g_dtls_connection_set_interaction:
* @conn: a connection
- * @interaction: (allow-none): an interaction object, or %NULL
+ * @interaction: (nullable): an interaction object, or %NULL
*
* Set the object that will be used to interact with the user. It will be used
* for things like prompting the user for passwords.
@@ -636,7 +636,7 @@ g_dtls_connection_get_rehandshake_mode (GDtlsConnection *conn)
/**
* g_dtls_connection_handshake:
* @conn: a #GDtlsConnection
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @error: a #GError, or %NULL
*
* Attempts a TLS handshake on @conn.
@@ -681,7 +681,7 @@ g_dtls_connection_handshake (GDtlsConnection *conn,
* g_dtls_connection_handshake_async:
* @conn: a #GDtlsConnection
* @io_priority: the [I/O priority][io-priority] of the request
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @callback: callback to call when the handshake is complete
* @user_data: the data to pass to the callback function
*
diff --git a/gio/gdtlsserverconnection.c b/gio/gdtlsserverconnection.c
index dd736f8..93ee7d7 100644
--- a/gio/gdtlsserverconnection.c
+++ b/gio/gdtlsserverconnection.c
@@ -67,7 +67,7 @@ g_dtls_server_connection_default_init (GDtlsServerConnectionInterface *iface)
/**
* g_dtls_server_connection_new:
* @base_socket: the #GDatagramBased to wrap
- * @certificate: (allow-none): the default server certificate, or %NULL
+ * @certificate: (nullable): the default server certificate, or %NULL
* @error: #GError for error reporting, or %NULL to ignore
*
* Creates a new #GDtlsServerConnection wrapping @base_socket.
diff --git a/gio/gemblemedicon.c b/gio/gemblemedicon.c
index 95bc72e..cb9087a 100644
--- a/gio/gemblemedicon.c
+++ b/gio/gemblemedicon.c
@@ -143,7 +143,7 @@ g_emblemed_icon_init (GEmblemedIcon *emblemed)
/**
* g_emblemed_icon_new:
* @icon: a #GIcon
- * @emblem: (allow-none): a #GEmblem, or %NULL
+ * @emblem: (nullable): a #GEmblem, or %NULL
*
* Creates a new emblemed icon for @icon with the emblem @emblem.
*
diff --git a/gio/gfile.c b/gio/gfile.c
index 0e9b608..a1c80d3 100644
--- a/gio/gfile.c
+++ b/gio/gfile.c
@@ -708,7 +708,7 @@ g_file_get_parent (GFile *file)
/**
* g_file_has_parent:
* @file: input #GFile
- * @parent: (allow-none): the parent to check for, or %NULL
+ * @parent: (nullable): the parent to check for, or %NULL
*
* Checks if @file has a parent, and optionally, if it is @parent.
*
@@ -915,7 +915,7 @@ g_file_resolve_relative_path (GFile *file,
* @file: input #GFile
* @attributes: an attribute query string
* @flags: a set of #GFileQueryInfoFlags
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @error: #GError for error reporting
*
@@ -980,7 +980,7 @@ g_file_enumerate_children (GFile *file,
* @attributes: an attribute query string
* @flags: a set of #GFileQueryInfoFlags
* @io_priority: the [I/O priority][io-priority] of the request
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @callback: (scope async): a #GAsyncReadyCallback to call when the
* request is satisfied
@@ -1053,7 +1053,7 @@ g_file_enumerate_children_finish (GFile *file,
/**
* g_file_query_exists:
* @file: input #GFile
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
*
* Utility function to check if a particular file exists. This is
@@ -1105,7 +1105,7 @@ g_file_query_exists (GFile *file,
* g_file_query_file_type:
* @file: input #GFile
* @flags: a set of #GFileQueryInfoFlags passed to g_file_query_info()
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
*
* Utility function to inspect the #GFileType of a file. This is
@@ -1146,7 +1146,7 @@ g_file_query_file_type (GFile *file,
* @file: input #GFile
* @attributes: an attribute query string
* @flags: a set of #GFileQueryInfoFlags
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @error: a #GError
*
@@ -1217,7 +1217,7 @@ g_file_query_info (GFile *file,
* @attributes: an attribute query string
* @flags: a set of #GFileQueryInfoFlags
* @io_priority: the [I/O priority][io-priority] of the request
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @callback: (scope async): a #GAsyncReadyCallback to call when the
* request is satisfied
@@ -1290,7 +1290,7 @@ g_file_query_info_finish (GFile *file,
* g_file_query_filesystem_info:
* @file: input #GFile
* @attributes: an attribute query string
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @error: a #GError
*
@@ -1354,7 +1354,7 @@ g_file_query_filesystem_info (GFile *file,
* @file: input #GFile
* @attributes: an attribute query string
* @io_priority: the [I/O priority][io-priority] of the request
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @callback: (scope async): a #GAsyncReadyCallback to call
* when the request is satisfied
@@ -1426,7 +1426,7 @@ g_file_query_filesystem_info_finish (GFile *file,
/**
* g_file_find_enclosing_mount:
* @file: input #GFile
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @error: a #GError
*
@@ -1476,7 +1476,7 @@ g_file_find_enclosing_mount (GFile *file,
* g_file_find_enclosing_mount_async:
* @file: a #GFile
* @io_priority: the [I/O priority][io-priority] of the request
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @callback: (scope async): a #GAsyncReadyCallback to call
* when the request is satisfied
@@ -1543,7 +1543,7 @@ g_file_find_enclosing_mount_finish (GFile *file,
/**
* g_file_read:
* @file: #GFile to read
- * @cancellable: (allow-none): a #GCancellable
+ * @cancellable: (nullable): a #GCancellable
* @error: a #GError, or %NULL
*
* Opens a file for reading. The result is a #GFileInputStream that
@@ -1591,7 +1591,7 @@ g_file_read (GFile *file,
* g_file_append_to:
* @file: input #GFile
* @flags: a set of #GFileCreateFlags
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @error: a #GError, or %NULL
*
@@ -1646,7 +1646,7 @@ g_file_append_to (GFile *file,
* g_file_create:
* @file: input #GFile
* @flags: a set of #GFileCreateFlags
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @error: a #GError, or %NULL
*
@@ -1703,11 +1703,11 @@ g_file_create (GFile *file,
/**
* g_file_replace:
* @file: input #GFile
- * @etag: (allow-none): an optional [entity tag][gfile-etag]
+ * @etag: (nullable): an optional [entity tag][gfile-etag]
* for the current #GFile, or #NULL to ignore
* @make_backup: %TRUE if a backup should be created
* @flags: a set of #GFileCreateFlags
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @error: a #GError, or %NULL
*
@@ -1791,7 +1791,7 @@ g_file_replace (GFile *file,
/**
* g_file_open_readwrite:
* @file: #GFile to open
- * @cancellable: (allow-none): a #GCancellable
+ * @cancellable: (nullable): a #GCancellable
* @error: a #GError, or %NULL
*
* Opens an existing file for reading and writing. The result is
@@ -1845,7 +1845,7 @@ g_file_open_readwrite (GFile *file,
* g_file_create_readwrite:
* @file: a #GFile
* @flags: a set of #GFileCreateFlags
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @error: return location for a #GError, or %NULL
*
@@ -1908,11 +1908,11 @@ g_file_create_readwrite (GFile *file,
/**
* g_file_replace_readwrite:
* @file: a #GFile
- * @etag: (allow-none): an optional [entity tag][gfile-etag]
+ * @etag: (nullable): an optional [entity tag][gfile-etag]
* for the current #GFile, or #NULL to ignore
* @make_backup: %TRUE if a backup should be created
* @flags: a set of #GFileCreateFlags
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @error: return location for a #GError, or %NULL
*
@@ -1964,7 +1964,7 @@ g_file_replace_readwrite (GFile *file,
* g_file_read_async:
* @file: input #GFile
* @io_priority: the [I/O priority][io-priority] of the request
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @callback: (scope async): a #GAsyncReadyCallback to call
* when the request is satisfied
@@ -2032,7 +2032,7 @@ g_file_read_finish (GFile *file,
* @file: input #GFile
* @flags: a set of #GFileCreateFlags
* @io_priority: the [I/O priority][io-priority] of the request
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @callback: (scope async): a #GAsyncReadyCallback to call
* when the request is satisfied
@@ -2103,7 +2103,7 @@ g_file_append_to_finish (GFile *file,
* @file: input #GFile
* @flags: a set of #GFileCreateFlags
* @io_priority: the [I/O priority][io-priority] of the request
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @callback: (scope async): a #GAsyncReadyCallback to call
* when the request is satisfied
@@ -2172,12 +2172,12 @@ g_file_create_finish (GFile *file,
/**
* g_file_replace_async:
* @file: input #GFile
- * @etag: (allow-none): an [entity tag][gfile-etag] for the current #GFile,
+ * @etag: (nullable): an [entity tag][gfile-etag] for the current #GFile,
* or %NULL to ignore
* @make_backup: %TRUE if a backup should be created
* @flags: a set of #GFileCreateFlags
* @io_priority: the [I/O priority][io-priority] of the request
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @callback: (scope async): a #GAsyncReadyCallback to call
* when the request is satisfied
@@ -2251,7 +2251,7 @@ g_file_replace_finish (GFile *file,
* g_file_open_readwrite_async
* @file: input #GFile
* @io_priority: the [I/O priority][io-priority] of the request
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @callback: (scope async): a #GAsyncReadyCallback to call
* when the request is satisfied
@@ -2323,7 +2323,7 @@ g_file_open_readwrite_finish (GFile *file,
* @file: input #GFile
* @flags: a set of #GFileCreateFlags
* @io_priority: the [I/O priority][io-priority] of the request
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @callback: (scope async): a #GAsyncReadyCallback to call
* when the request is satisfied
@@ -2396,12 +2396,12 @@ g_file_create_readwrite_finish (GFile *file,
/**
* g_file_replace_readwrite_async:
* @file: input #GFile
- * @etag: (allow-none): an [entity tag][gfile-etag] for the current #GFile,
+ * @etag: (nullable): an [entity tag][gfile-etag] for the current #GFile,
* or %NULL to ignore
* @make_backup: %TRUE if a backup should be created
* @flags: a set of #GFileCreateFlags
* @io_priority: the [I/O priority][io-priority] of the request
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @callback: (scope async): a #GAsyncReadyCallback to call
* when the request is satisfied
@@ -2707,7 +2707,7 @@ build_attribute_list_for_copy (GFile *file,
* @source: a #GFile with attributes
* @destination: a #GFile to copy attributes to
* @flags: a set of #GFileCopyFlags
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @error: a #GError, %NULL to ignore
*
@@ -3277,9 +3277,9 @@ file_copy_fallback (GFile *source,
* @source: input #GFile
* @destination: destination #GFile
* @flags: set of #GFileCopyFlags
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
- * @progress_callback: (allow-none) (scope call): function to callback with
+ * @progress_callback: (nullable) (scope call): function to callback with
* progress information, or %NULL if progress information is not needed
* @progress_callback_data: (closure): user data to pass to @progress_callback
* @error: #GError to set on error, or %NULL
@@ -3402,9 +3402,9 @@ g_file_copy (GFile *source,
* @destination: destination #GFile
* @flags: set of #GFileCopyFlags
* @io_priority: the [I/O priority][io-priority] of the request
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
- * @progress_callback: (allow-none): function to callback with progress
+ * @progress_callback: (nullable): function to callback with progress
* information, or %NULL if progress information is not needed
* @progress_callback_data: (closure): user data to pass to @progress_callback
* @callback: a #GAsyncReadyCallback to call when the request is satisfied
@@ -3481,9 +3481,9 @@ g_file_copy_finish (GFile *file,
* @source: #GFile pointing to the source location
* @destination: #GFile pointing to the destination location
* @flags: set of #GFileCopyFlags
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
- * @progress_callback: (allow-none) (scope call): #GFileProgressCallback
+ * @progress_callback: (nullable) (scope call): #GFileProgressCallback
* function for updates
* @progress_callback_data: (closure): gpointer to user data for
* the callback function
@@ -3617,7 +3617,7 @@ g_file_move (GFile *source,
/**
* g_file_make_directory:
* @file: input #GFile
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @error: a #GError, or %NULL
*
@@ -3667,7 +3667,7 @@ g_file_make_directory (GFile *file,
* g_file_make_directory_async:
* @file: input #GFile
* @io_priority: the [I/O priority][io-priority] of the request
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @callback: a #GAsyncReadyCallback to call
* when the request is satisfied
@@ -3727,7 +3727,7 @@ g_file_make_directory_finish (GFile *file,
/**
* g_file_make_directory_with_parents:
* @file: input #GFile
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @error: a #GError, or %NULL
*
@@ -3851,7 +3851,7 @@ g_file_make_directory_with_parents (GFile *file,
* @file: a #GFile with the name of the symlink to create
* @symlink_value: (type filename): a string with the path for the target
* of the new symlink
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @error: a #GError
*
@@ -3902,7 +3902,7 @@ g_file_make_symbolic_link (GFile *file,
/**
* g_file_delete:
* @file: input #GFile
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @error: a #GError, or %NULL
*
@@ -3945,7 +3945,7 @@ g_file_delete (GFile *file,
* g_file_delete_async:
* @file: input #GFile
* @io_priority: the [I/O priority][io-priority] of the request
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @callback: a #GAsyncReadyCallback to call
* when the request is satisfied
@@ -4009,7 +4009,7 @@ g_file_delete_finish (GFile *file,
/**
* g_file_trash:
* @file: #GFile to send to trash
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @error: a #GError, or %NULL
*
@@ -4054,7 +4054,7 @@ g_file_trash (GFile *file,
* g_file_trash_async:
* @file: input #GFile
* @io_priority: the [I/O priority][io-priority] of the request
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @callback: a #GAsyncReadyCallback to call
* when the request is satisfied
@@ -4115,7 +4115,7 @@ g_file_trash_finish (GFile *file,
* g_file_set_display_name:
* @file: input #GFile
* @display_name: a string
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @error: a #GError, or %NULL
*
@@ -4172,7 +4172,7 @@ g_file_set_display_name (GFile *file,
* @file: input #GFile
* @display_name: a string
* @io_priority: the [I/O priority][io-priority] of the request
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @callback: (scope async): a #GAsyncReadyCallback to call
* when the request is satisfied
@@ -4241,7 +4241,7 @@ g_file_set_display_name_finish (GFile *file,
/**
* g_file_query_settable_attributes:
* @file: input #GFile
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @error: a #GError, or %NULL
*
@@ -4299,7 +4299,7 @@ g_file_query_settable_attributes (GFile *file,
/**
* g_file_query_writable_namespaces:
* @file: input #GFile
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @error: a #GError, or %NULL
*
@@ -4361,10 +4361,10 @@ g_file_query_writable_namespaces (GFile *file,
* @file: input #GFile
* @attribute: a string containing the attribute's name
* @type: The type of the attribute
- * @value_p: (allow-none): a pointer to the value (or the pointer
+ * @value_p: (nullable): a pointer to the value (or the pointer
* itself if the type is a pointer type)
* @flags: a set of #GFileQueryInfoFlags
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @error: a #GError, or %NULL
*
@@ -4414,7 +4414,7 @@ g_file_set_attribute (GFile *file,
* @file: input #GFile
* @info: a #GFileInfo
* @flags: #GFileQueryInfoFlags
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @error: a #GError, or %NULL
*
@@ -4506,7 +4506,7 @@ g_file_real_set_attributes_from_info (GFile *file,
* @info: a #GFileInfo
* @flags: a #GFileQueryInfoFlags
* @io_priority: the [I/O priority][io-priority] of the request
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @callback: (scope async): a #GAsyncReadyCallback
* @user_data: (closure): a #gpointer
@@ -4579,7 +4579,7 @@ g_file_set_attributes_finish (GFile *file,
* @attribute: a string containing the attribute's name
* @value: a string containing the attribute's value
* @flags: #GFileQueryInfoFlags
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @error: a #GError, or %NULL
*
@@ -4611,7 +4611,7 @@ g_file_set_attribute_string (GFile *file,
* @attribute: a string containing the attribute's name
* @value: a string containing the attribute's new value
* @flags: a #GFileQueryInfoFlags
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @error: a #GError, or %NULL
*
@@ -4645,7 +4645,7 @@ g_file_set_attribute_byte_string (GFile *file,
* @attribute: a string containing the attribute's name
* @value: a #guint32 containing the attribute's new value
* @flags: a #GFileQueryInfoFlags
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @error: a #GError, or %NULL
*
@@ -4678,7 +4678,7 @@ g_file_set_attribute_uint32 (GFile *file,
* @attribute: a string containing the attribute's name
* @value: a #gint32 containing the attribute's new value
* @flags: a #GFileQueryInfoFlags
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @error: a #GError, or %NULL
*
@@ -4711,7 +4711,7 @@ g_file_set_attribute_int32 (GFile *file,
* @attribute: a string containing the attribute's name
* @value: a #guint64 containing the attribute's new value
* @flags: a #GFileQueryInfoFlags
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @error: a #GError, or %NULL
*
@@ -4744,7 +4744,7 @@ g_file_set_attribute_uint64 (GFile *file,
* @attribute: a string containing the attribute's name
* @value: a #guint64 containing the attribute's new value
* @flags: a #GFileQueryInfoFlags
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @error: a #GError, or %NULL
*
@@ -4774,11 +4774,11 @@ g_file_set_attribute_int64 (GFile *file,
* g_file_mount_mountable:
* @file: input #GFile
* @flags: flags affecting the operation
- * @mount_operation: (allow-none): a #GMountOperation,
+ * @mount_operation: (nullable): a #GMountOperation,
* or %NULL to avoid user interaction
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
- * @callback: (scope async) (allow-none): a #GAsyncReadyCallback to call
+ * @callback: (scope async) (nullable): a #GAsyncReadyCallback to call
* when the request is satisfied, or %NULL
* @user_data: (closure): the data to pass to callback function
*
@@ -4862,9 +4862,9 @@ g_file_mount_mountable_finish (GFile *file,
* g_file_unmount_mountable:
* @file: input #GFile
* @flags: flags affecting the operation
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
- * @callback: (scope async) (allow-none): a #GAsyncReadyCallback to call
+ * @callback: (scope async) (nullable): a #GAsyncReadyCallback to call
* when the request is satisfied, or %NULL
* @user_data: (closure): the data to pass to callback function
*
@@ -4949,11 +4949,11 @@ g_file_unmount_mountable_finish (GFile *file,
* g_file_unmount_mountable_with_operation:
* @file: input #GFile
* @flags: flags affecting the operation
- * @mount_operation: (allow-none): a #GMountOperation,
+ * @mount_operation: (nullable): a #GMountOperation,
* or %NULL to avoid user interaction
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
- * @callback: (scope async) (allow-none): a #GAsyncReadyCallback to call
+ * @callback: (scope async) (nullable): a #GAsyncReadyCallback to call
* when the request is satisfied, or %NULL
* @user_data: (closure): the data to pass to callback function
*
@@ -5050,9 +5050,9 @@ g_file_unmount_mountable_with_operation_finish (GFile *file,
* g_file_eject_mountable:
* @file: input #GFile
* @flags: flags affecting the operation
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
- * @callback: (scope async) (allow-none): a #GAsyncReadyCallback to call
+ * @callback: (scope async) (nullable): a #GAsyncReadyCallback to call
* when the request is satisfied, or %NULL
* @user_data: (closure): the data to pass to callback function
*
@@ -5134,11 +5134,11 @@ g_file_eject_mountable_finish (GFile *file,
* g_file_eject_mountable_with_operation:
* @file: input #GFile
* @flags: flags affecting the operation
- * @mount_operation: (allow-none): a #GMountOperation,
+ * @mount_operation: (nullable): a #GMountOperation,
* or %NULL to avoid user interaction
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
- * @callback: (scope async) (allow-none): a #GAsyncReadyCallback to call
+ * @callback: (scope async) (nullable): a #GAsyncReadyCallback to call
* when the request is satisfied, or %NULL
* @user_data: (closure): the data to pass to callback function
*
@@ -5231,7 +5231,7 @@ g_file_eject_mountable_with_operation_finish (GFile *file,
* g_file_monitor_directory:
* @file: input #GFile
* @flags: a set of #GFileMonitorFlags
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @error: a #GError, or %NULL
*
@@ -5284,7 +5284,7 @@ g_file_monitor_directory (GFile *file,
* g_file_monitor_file:
* @file: input #GFile
* @flags: a set of #GFileMonitorFlags
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @error: a #GError, or %NULL
*
@@ -5339,7 +5339,7 @@ g_file_monitor_file (GFile *file,
* g_file_monitor:
* @file: input #GFile
* @flags: a set of #GFileMonitorFlags
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
* @error: a #GError, or %NULL
*
@@ -6375,7 +6375,7 @@ g_file_new_for_uri (const char *uri)
/**
* g_file_new_tmp:
- * @tmpl: (type filename) (allow-none): Template for the file
+ * @tmpl: (type filename) (nullable): Template for the file
* name, as in g_file_open_tmp(), or %NULL for a default template
* @iostream: (out): on return, a #GFileIOStream for the created file
* @error: a #GError, or %NULL
@@ -6563,11 +6563,11 @@ g_file_new_for_commandline_arg_and_cwd (const gchar *arg,
* g_file_mount_enclosing_volume:
* @location: input #GFile
* @flags: flags affecting the operation
- * @mount_operation: (allow-none): a #GMountOperation
+ * @mount_operation: (nullable): a #GMountOperation
* or %NULL to avoid user interaction
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
- * @callback: (allow-none): a #GAsyncReadyCallback to call
+ * @callback: (nullable): a #GAsyncReadyCallback to call
* when the request is satisfied, or %NULL
* @user_data: the data to pass to callback function
*
@@ -6721,9 +6721,9 @@ g_file_query_default_handler (GFile *file,
* @file: input #GFile
* @cancellable: optional #GCancellable object, %NULL to ignore
* @contents: (out) (transfer full) (element-type guint8) (array length=length): a location to place the
contents of the file
- * @length: (out) (allow-none): a location to place the length of the contents of the file,
+ * @length: (out) (optional): a location to place the length of the contents of the file,
* or %NULL if the length is not needed
- * @etag_out: (out) (allow-none): a location to place the current entity tag for the file,
+ * @etag_out: (out) (optional): a location to place the current entity tag for the file,
* or %NULL if the entity tag is not needed
* @error: a #GError, or %NULL
*
@@ -7007,9 +7007,9 @@ g_file_load_partial_contents_async (GFile *file,
* @file: input #GFile
* @res: a #GAsyncResult
* @contents: (out) (transfer full) (element-type guint8) (array length=length): a location to place the
contents of the file
- * @length: (out) (allow-none): a location to place the length of the contents of the file,
+ * @length: (out) (optional): a location to place the length of the contents of the file,
* or %NULL if the length is not needed
- * @etag_out: (out) (allow-none): a location to place the current entity tag for the file,
+ * @etag_out: (out) (optional): a location to place the current entity tag for the file,
* or %NULL if the entity tag is not needed
* @error: a #GError, or %NULL
*
@@ -7105,9 +7105,9 @@ g_file_load_contents_async (GFile *file,
* @file: input #GFile
* @res: a #GAsyncResult
* @contents: (out) (transfer full) (element-type guint8) (array length=length): a location to place the
contents of the file
- * @length: (out) (allow-none): a location to place the length of the contents of the file,
+ * @length: (out) (optional): a location to place the length of the contents of the file,
* or %NULL if the length is not needed
- * @etag_out: (out) (allow-none): a location to place the current entity tag for the file,
+ * @etag_out: (out) (optional): a location to place the current entity tag for the file,
* or %NULL if the entity tag is not needed
* @error: a #GError, or %NULL
*
@@ -7141,11 +7141,11 @@ g_file_load_contents_finish (GFile *file,
* @file: input #GFile
* @contents: (element-type guint8) (array length=length): a string containing the new contents for @file
* @length: the length of @contents in bytes
- * @etag: (allow-none): the old [entity-tag][gfile-etag] for the document,
+ * @etag: (nullable): the old [entity-tag][gfile-etag] for the document,
* or %NULL
* @make_backup: %TRUE if a backup should be created
* @flags: a set of #GFileCreateFlags
- * @new_etag: (allow-none) (out): a location to a new [entity tag][gfile-etag]
+ * @new_etag: (out) (optional): a location to a new [entity tag][gfile-etag]
* for the document. This should be freed with g_free() when no longer
* needed, or %NULL
* @cancellable: optional #GCancellable object, %NULL to ignore
@@ -7348,7 +7348,7 @@ replace_contents_open_callback (GObject *obj,
* @file: input #GFile
* @contents: (element-type guint8) (array length=length): string of contents to replace the file with
* @length: the length of @contents in bytes
- * @etag: (allow-none): a new [entity tag][gfile-etag] for the @file, or %NULL
+ * @etag: (nullable): a new [entity tag][gfile-etag] for the @file, or %NULL
* @make_backup: %TRUE if a backup should be created
* @flags: a set of #GFileCreateFlags
* @cancellable: optional #GCancellable object, %NULL to ignore
@@ -7398,7 +7398,7 @@ g_file_replace_contents_async (GFile *file,
* g_file_replace_contents_bytes_async:
* @file: input #GFile
* @contents: a #GBytes
- * @etag: (allow-none): a new [entity tag][gfile-etag] for the @file, or %NULL
+ * @etag: (nullable): a new [entity tag][gfile-etag] for the @file, or %NULL
* @make_backup: %TRUE if a backup should be created
* @flags: a set of #GFileCreateFlags
* @cancellable: optional #GCancellable object, %NULL to ignore
@@ -7453,7 +7453,7 @@ g_file_replace_contents_bytes_async (GFile *file,
* g_file_replace_contents_finish:
* @file: input #GFile
* @res: a #GAsyncResult
- * @new_etag: (out) (allow-none): a location of a new [entity tag][gfile-etag]
+ * @new_etag: (out) (optional): a location of a new [entity tag][gfile-etag]
* for the document. This should be freed with g_free() when it is no
* longer needed, or %NULL
* @error: a #GError, or %NULL
@@ -7651,13 +7651,13 @@ g_file_real_measure_disk_usage_finish (GFile *file,
* g_file_measure_disk_usage:
* @file: a #GFile
* @flags: #GFileMeasureFlags
- * @cancellable: (allow-none): optional #GCancellable
- * @progress_callback: (allow-none): a #GFileMeasureProgressCallback
+ * @cancellable: (nullable): optional #GCancellable
+ * @progress_callback: (nullable): a #GFileMeasureProgressCallback
* @progress_data: user_data for @progress_callback
- * @disk_usage: (allow-none) (out): the number of bytes of disk space used
- * @num_dirs: (allow-none) (out): the number of directories encountered
- * @num_files: (allow-none) (out): the number of non-directories encountered
- * @error: (allow-none): %NULL, or a pointer to a %NULL #GError pointer
+ * @disk_usage: (out) (optional): the number of bytes of disk space used
+ * @num_dirs: (out) (optional): the number of directories encountered
+ * @num_files: (out) (optional): the number of non-directories encountered
+ * @error: (nullable): %NULL, or a pointer to a %NULL #GError pointer
*
* Recursively measures the disk usage of @file.
*
@@ -7709,10 +7709,10 @@ g_file_measure_disk_usage (GFile *file,
* @file: a #GFile
* @flags: #GFileMeasureFlags
* @io_priority: the [I/O priority][io-priority] of the request
- * @cancellable: (allow-none): optional #GCancellable
- * @progress_callback: (allow-none): a #GFileMeasureProgressCallback
+ * @cancellable: (nullable): optional #GCancellable
+ * @progress_callback: (nullable): a #GFileMeasureProgressCallback
* @progress_data: user_data for @progress_callback
- * @callback: (allow-none): a #GAsyncReadyCallback to call when complete
+ * @callback: (nullable): a #GAsyncReadyCallback to call when complete
* @user_data: the data to pass to callback function
*
* Recursively measures the disk usage of @file.
@@ -7744,10 +7744,10 @@ g_file_measure_disk_usage_async (GFile *file,
* g_file_measure_disk_usage_finish:
* @file: a #GFile
* @result: the #GAsyncResult passed to your #GAsyncReadyCallback
- * @disk_usage: (allow-none) (out): the number of bytes of disk space used
- * @num_dirs: (allow-none) (out): the number of directories encountered
- * @num_files: (allow-none) (out): the number of non-directories encountered
- * @error: (allow-none): %NULL, or a pointer to a %NULL #GError pointer
+ * @disk_usage: (out) (optional): the number of bytes of disk space used
+ * @num_dirs: (out) (optional): the number of directories encountered
+ * @num_files: (out) (optional): the number of non-directories encountered
+ * @error: (nullable): %NULL, or a pointer to a %NULL #GError pointer
*
* Collects the results from an earlier call to
* g_file_measure_disk_usage_async(). See g_file_measure_disk_usage() for
@@ -7776,9 +7776,9 @@ g_file_measure_disk_usage_finish (GFile *file,
* g_file_start_mountable:
* @file: input #GFile
* @flags: flags affecting the operation
- * @start_operation: (allow-none): a #GMountOperation, or %NULL to avoid user interaction
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore
- * @callback: (allow-none): a #GAsyncReadyCallback to call when the request is satisfied, or %NULL
+ * @start_operation: (nullable): a #GMountOperation, or %NULL to avoid user interaction
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore
+ * @callback: (nullable): a #GAsyncReadyCallback to call when the request is satisfied, or %NULL
* @user_data: the data to pass to callback function
*
* Starts a file of type #G_FILE_TYPE_MOUNTABLE.
@@ -7865,11 +7865,11 @@ g_file_start_mountable_finish (GFile *file,
* g_file_stop_mountable:
* @file: input #GFile
* @flags: flags affecting the operation
- * @mount_operation: (allow-none): a #GMountOperation,
+ * @mount_operation: (nullable): a #GMountOperation,
* or %NULL to avoid user interaction.
- * @cancellable: (allow-none): optional #GCancellable object,
+ * @cancellable: (nullable): optional #GCancellable object,
* %NULL to ignore
- * @callback: (allow-none): a #GAsyncReadyCallback to call
+ * @callback: (nullable): a #GAsyncReadyCallback to call
* when the request is satisfied, or %NULL
* @user_data: the data to pass to callback function
*
@@ -7955,7 +7955,7 @@ g_file_stop_mountable_finish (GFile *file,
* g_file_poll_mountable:
* @file: input #GFile
* @cancellable: optional #GCancellable object, %NULL to ignore
- * @callback: (allow-none): a #GAsyncReadyCallback to call
+ * @callback: (nullable): a #GAsyncReadyCallback to call
* when the request is satisfied, or %NULL
* @user_data: the data to pass to callback function
*
diff --git a/gio/gfileenumerator.c b/gio/gfileenumerator.c
index 3763cb6..e4905d7 100644
--- a/gio/gfileenumerator.c
+++ b/gio/gfileenumerator.c
@@ -176,7 +176,7 @@ g_file_enumerator_init (GFileEnumerator *enumerator)
/**
* g_file_enumerator_next_file:
* @enumerator: a #GFileEnumerator.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: location to store the error occurring, or %NULL to ignore
*
* Returns information for the next file in the enumerated object.
@@ -245,7 +245,7 @@ g_file_enumerator_next_file (GFileEnumerator *enumerator,
/**
* g_file_enumerator_close:
* @enumerator: a #GFileEnumerator.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: location to store the error occurring, or %NULL to ignore
*
* Releases all resources used by this enumerator, making the
@@ -310,8 +310,8 @@ next_async_callback_wrapper (GObject *source_object,
* g_file_enumerator_next_files_async:
* @enumerator: a #GFileEnumerator.
* @num_files: the number of file info objects to request
- * @io_priority: the [I/O priority][io-priority] of the request
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @io_priority: the [I/O priority][io-priority] of the request
+ * @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
*
@@ -437,7 +437,7 @@ close_async_callback_wrapper (GObject *source_object,
* g_file_enumerator_close_async:
* @enumerator: a #GFileEnumerator.
* @io_priority: the [I/O priority][io-priority] of the request
- * @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
*
@@ -576,8 +576,8 @@ g_file_enumerator_set_pending (GFileEnumerator *enumerator,
/**
* g_file_enumerator_iterate:
* @direnum: an open #GFileEnumerator
- * @out_info: (out) (transfer none) (allow-none): Output location for the next #GFileInfo, or %NULL
- * @out_child: (out) (transfer none) (allow-none): Output location for the next #GFile, or %NULL
+ * @out_info: (out) (transfer none) (optional): Output location for the next #GFileInfo, or %NULL
+ * @out_child: (out) (transfer none) (optional): Output location for the next #GFile, or %NULL
* @cancellable: a #GCancellable
* @error: a #GError
*
diff --git a/gio/gfileinfo.c b/gio/gfileinfo.c
index 49e0606..5577ce1 100644
--- a/gio/gfileinfo.c
+++ b/gio/gfileinfo.c
@@ -2663,7 +2663,7 @@ g_file_attribute_matcher_enumerate_next (GFileAttributeMatcher *matcher)
/**
* g_file_attribute_matcher_to_string:
- * @matcher: (allow-none): a #GFileAttributeMatcher.
+ * @matcher: (nullable): a #GFileAttributeMatcher.
*
* Prints what the matcher is matching against. The format will be
* equal to the format passed to g_file_attribute_matcher_new().
diff --git a/gio/gfileinputstream.c b/gio/gfileinputstream.c
index bdfb779..2dcd0ac 100644
--- a/gio/gfileinputstream.c
+++ b/gio/gfileinputstream.c
@@ -107,7 +107,7 @@ g_file_input_stream_init (GFileInputStream *stream)
* g_file_input_stream_query_info:
* @stream: a #GFileInputStream.
* @attributes: a file attribute query string.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: a #GError location to store the error occurring, or %NULL to
* ignore.
*
@@ -174,7 +174,7 @@ async_ready_callback_wrapper (GObject *source_object,
* @stream: a #GFileInputStream.
* @attributes: a file attribute query string.
* @io_priority: the [I/O priority][io-priority] of the request
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @callback: (scope async): callback to call when the request is satisfied
* @user_data: (closure): the data to pass to callback function
*
diff --git a/gio/gfileiostream.c b/gio/gfileiostream.c
index 8a0ec15..30e9067 100644
--- a/gio/gfileiostream.c
+++ b/gio/gfileiostream.c
@@ -112,7 +112,7 @@ g_file_io_stream_init (GFileIOStream *stream)
* g_file_io_stream_query_info:
* @stream: a #GFileIOStream.
* @attributes: a file attribute query string.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: a #GError, %NULL to ignore.
*
* Queries a file io stream for the given @attributes.
@@ -192,7 +192,7 @@ async_ready_callback_wrapper (GObject *source_object,
* @stream: a #GFileIOStream.
* @attributes: a file attribute query string.
* @io_priority: the [I/O priority][gio-GIOScheduler] of the request
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @callback: (scope async): callback to call when the request is satisfied
* @user_data: (closure): the data to pass to callback function
*
diff --git a/gio/gfilemonitor.c b/gio/gfilemonitor.c
index 66808d9..c52aa7f 100644
--- a/gio/gfilemonitor.c
+++ b/gio/gfilemonitor.c
@@ -144,7 +144,7 @@ g_file_monitor_class_init (GFileMonitorClass *klass)
* GFileMonitor::changed:
* @monitor: a #GFileMonitor.
* @file: a #GFile.
- * @other_file: (allow-none): a #GFile or #NULL.
+ * @other_file: (nullable): a #GFile or #NULL.
* @event_type: a #GFileMonitorEvent.
*
* Emitted when @file has been changed.
diff --git a/gio/gicon.c b/gio/gicon.c
index a252c40..03c8c01 100644
--- a/gio/gicon.c
+++ b/gio/gicon.c
@@ -105,8 +105,8 @@ g_icon_hash (gconstpointer icon)
/**
* g_icon_equal:
- * @icon1: (allow-none): pointer to the first #GIcon.
- * @icon2: (allow-none): pointer to the second #GIcon.
+ * @icon1: (nullable): pointer to the first #GIcon.
+ * @icon2: (nullable): pointer to the second #GIcon.
*
* Checks if two icons are equal.
*
diff --git a/gio/ginitable.c b/gio/ginitable.c
index 23d6069..92cf3ff 100644
--- a/gio/ginitable.c
+++ b/gio/ginitable.c
@@ -118,7 +118,7 @@ g_initable_init (GInitable *initable,
* @cancellable: optional #GCancellable object, %NULL to ignore.
* @error: a #GError location to store the error occurring, or %NULL to
* ignore.
- * @first_property_name: (allow-none): the name of the first property, or %NULL if no
+ * @first_property_name: (nullable): the name of the first property, or %NULL if no
* properties
* @...: the value if the first property, followed by and other property
* value pairs, and ended by %NULL.
diff --git a/gio/ginputstream.c b/gio/ginputstream.c
index 9406bbb..299b441 100644
--- a/gio/ginputstream.c
+++ b/gio/ginputstream.c
@@ -130,7 +130,7 @@ g_input_stream_init (GInputStream *stream)
* @buffer: (array length=count) (element-type guint8): a buffer to
* read data into (which should be at least count bytes long).
* @count: the number of bytes that will be read from the stream
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: location to store the error occurring, or %NULL to ignore
*
* Tries to read @count bytes from the stream into the buffer starting at
@@ -212,7 +212,7 @@ g_input_stream_read (GInputStream *stream,
* read data into (which should be at least count bytes long).
* @count: the number of bytes that will be read from the stream
* @bytes_read: (out): location to store the number of bytes that was read from the stream
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: location to store the error occurring, or %NULL to ignore
*
* Tries to read @count bytes from the stream into the buffer starting at
@@ -279,7 +279,7 @@ g_input_stream_read_all (GInputStream *stream,
* @stream: a #GInputStream.
* @count: maximum number of bytes that will be read from the stream. Common
* values include 4096 and 8192.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: location to store the error occurring, or %NULL to ignore
*
* Like g_input_stream_read(), this tries to read @count bytes from
@@ -339,7 +339,7 @@ g_input_stream_read_bytes (GInputStream *stream,
* g_input_stream_skip:
* @stream: a #GInputStream.
* @count: the number of bytes that will be skipped from the stream
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: location to store the error occurring, or %NULL to ignore
*
* Tries to skip @count bytes from the stream. Will block during the operation.
@@ -455,7 +455,7 @@ g_input_stream_real_skip (GInputStream *stream,
/**
* g_input_stream_close:
* @stream: A #GInputStream.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: location to store the error occurring, or %NULL to ignore
*
* Closes the stream, releasing resources related to it.
@@ -555,7 +555,7 @@ async_ready_close_callback_wrapper (GObject *source_object,
* @count: the number of bytes that will be read from the stream
* @io_priority: the [I/O priority][io-priority]
* of the request.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @callback: (scope async): callback to call when the request is satisfied
* @user_data: (closure): the data to pass to callback function
*
@@ -746,7 +746,7 @@ read_all_async_thread (GTask *task,
* read data into (which should be at least count bytes long)
* @count: the number of bytes that will be read from the stream
* @io_priority: the [I/O priority][io-priority] of the request
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore
* @callback: (scope async): callback to call when the request is satisfied
* @user_data: (closure): the data to pass to callback function
*
@@ -881,7 +881,7 @@ read_bytes_callback (GObject *stream,
* @stream: A #GInputStream.
* @count: the number of bytes that will be read from the stream
* @io_priority: the [I/O priority][io-priority] of the request
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @callback: (scope async): callback to call when the request is satisfied
* @user_data: (closure): the data to pass to callback function
*
@@ -959,7 +959,7 @@ g_input_stream_read_bytes_finish (GInputStream *stream,
* @stream: A #GInputStream.
* @count: the number of bytes that will be skipped from the stream
* @io_priority: the [I/O priority][io-priority] of the request
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @callback: (scope async): callback to call when the request is satisfied
* @user_data: (closure): the data to pass to callback function
*
@@ -1070,7 +1070,7 @@ g_input_stream_skip_finish (GInputStream *stream,
* g_input_stream_close_async:
* @stream: A #GInputStream.
* @io_priority: the [I/O priority][io-priority] of the request
- * @cancellable: (allow-none): optional cancellable object
+ * @cancellable: (nullable): optional cancellable object
* @callback: (scope async): callback to call when the request is satisfied
* @user_data: (closure): the data to pass to callback function
*
diff --git a/gio/giomodule.c b/gio/giomodule.c
index dcd523b..29a9f09 100644
--- a/gio/giomodule.c
+++ b/gio/giomodule.c
@@ -664,7 +664,7 @@ try_class (GIOExtension *extension,
/**
* _g_io_module_get_default_type:
* @extension_point: the name of an extension point
- * @envvar: (allow-none): the name of an environment variable to
+ * @envvar: (nullable): the name of an environment variable to
* override the default implementation.
* @is_supported_offset: a vtable offset, or zero
*
@@ -785,9 +785,9 @@ try_implementation (GIOExtension *extension,
/**
* _g_io_module_get_default:
* @extension_point: the name of an extension point
- * @envvar: (allow-none): the name of an environment variable to
+ * @envvar: (nullable): the name of an environment variable to
* override the default implementation.
- * @verify_func: (allow-none): a function to call to verify that
+ * @verify_func: (nullable): a function to call to verify that
* a given implementation is usable in the current environment.
*
* Retrieves the default object implementing @extension_point.
diff --git a/gio/gioscheduler.c b/gio/gioscheduler.c
index f1632af..b8f87d5 100644
--- a/gio/gioscheduler.c
+++ b/gio/gioscheduler.c
@@ -94,7 +94,7 @@ io_job_thread (GTask *task,
* g_io_scheduler_push_job:
* @job_func: a #GIOSchedulerJobFunc.
* @user_data: data to pass to @job_func
- * @notify: (allow-none): a #GDestroyNotify for @user_data, or %NULL
+ * @notify: (nullable): a #GDestroyNotify for @user_data, or %NULL
* @io_priority: the [I/O priority][io-priority]
* of the request.
* @cancellable: optional #GCancellable object, %NULL to ignore.
@@ -226,7 +226,7 @@ mainloop_proxy_free (MainLoopProxy *proxy)
* @job: a #GIOSchedulerJob
* @func: a #GSourceFunc callback that will be called in the original thread
* @user_data: data to pass to @func
- * @notify: (allow-none): a #GDestroyNotify for @user_data, or %NULL
+ * @notify: (nullable): a #GDestroyNotify for @user_data, or %NULL
*
* Used from an I/O job to send a callback to be run in the thread
* that the job was started from, waiting for the result (and thus
@@ -281,7 +281,7 @@ g_io_scheduler_job_send_to_mainloop (GIOSchedulerJob *job,
* @job: a #GIOSchedulerJob
* @func: a #GSourceFunc callback that will be called in the original thread
* @user_data: data to pass to @func
- * @notify: (allow-none): a #GDestroyNotify for @user_data, or %NULL
+ * @notify: (nullable): a #GDestroyNotify for @user_data, or %NULL
*
* Used from an I/O job to send a callback to be run asynchronously in
* the thread that the job was started from. The callback will be run
diff --git a/gio/giostream.c b/gio/giostream.c
index c50a0eb..423c107 100644
--- a/gio/giostream.c
+++ b/gio/giostream.c
@@ -355,7 +355,7 @@ g_io_stream_real_close (GIOStream *stream,
/**
* g_io_stream_close:
* @stream: a #GIOStream
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore
* @error: location to store the error occurring, or %NULL to ignore
*
* Closes the stream, releasing resources related to it. This will also
@@ -461,7 +461,7 @@ async_ready_close_callback_wrapper (GObject *source_object,
* g_io_stream_close_async:
* @stream: a #GIOStream
* @io_priority: the io priority of the request
- * @cancellable: (allow-none): optional cancellable object
+ * @cancellable: (nullable): optional cancellable object
* @callback: (scope async): callback to call when the request is satisfied
* @user_data: (closure): the data to pass to callback function
*
@@ -826,7 +826,7 @@ splice_cancelled_cb (GCancellable *cancellable,
* @stream2: a #GIOStream.
* @flags: a set of #GIOStreamSpliceFlags.
* @io_priority: the io priority of the request.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @callback: (scope async): a #GAsyncReadyCallback.
* @user_data: (closure): user data passed to @callback.
*
diff --git a/gio/giotypes.h b/gio/giotypes.h
index 262e14d..15bed48 100644
--- a/gio/giotypes.h
+++ b/gio/giotypes.h
@@ -505,12 +505,12 @@ struct _GOutputVector {
/**
* GOutputMessage:
- * @address: (allow-none): a #GSocketAddress, or %NULL
+ * @address: (nullable): a #GSocketAddress, or %NULL
* @vectors: pointer to an array of output vectors
* @num_vectors: the number of output vectors pointed to by @vectors.
* @bytes_sent: initialize to 0. Will be set to the number of bytes
* that have been sent
- * @control_messages: (array length=num_control_messages) (allow-none): a pointer
+ * @control_messages: (array length=num_control_messages) (nullable): a pointer
* to an array of #GSocketControlMessages, or %NULL.
* @num_control_messages: number of elements in @control_messages.
*
@@ -602,7 +602,7 @@ typedef struct _GDBusObjectManagerServer GDBusObjectManagerServer;
* GDBusProxyTypeFunc:
* @manager: A #GDBusObjectManagerClient.
* @object_path: The object path of the remote object.
- * @interface_name: (allow-none): The interface name of the remote object or %NULL if a #GDBusObjectProxy
#GType is requested.
+ * @interface_name: (nullable): The interface name of the remote object or %NULL if a #GDBusObjectProxy
#GType is requested.
* @user_data: User data.
*
* Function signature for a function used to determine the #GType to
diff --git a/gio/gkeyfilesettingsbackend.c b/gio/gkeyfilesettingsbackend.c
index 8eb7681..9375955 100644
--- a/gio/gkeyfilesettingsbackend.c
+++ b/gio/gkeyfilesettingsbackend.c
@@ -571,7 +571,7 @@ dir_changed (GFileMonitor *monitor,
* g_keyfile_settings_backend_new:
* @filename: the filename of the keyfile
* @root_path: the path under which all settings keys appear
- * @root_group: (allow-none): the group name corresponding to
+ * @root_group: (nullable): the group name corresponding to
* @root_path, or %NULL
*
* Creates a keyfile-backed #GSettingsBackend.
diff --git a/gio/gloadableicon.c b/gio/gloadableicon.c
index 6dba5fe..eeccd8d 100644
--- a/gio/gloadableicon.c
+++ b/gio/gloadableicon.c
@@ -62,7 +62,7 @@ g_loadable_icon_default_init (GLoadableIconIface *iface)
* @size: an integer.
* @type: (out) (optional): a location to store the type of the loaded
* icon, %NULL to ignore.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to
* ignore.
* @error: a #GError location to store the error occurring, or %NULL
* to ignore.
@@ -92,7 +92,7 @@ g_loadable_icon_load (GLoadableIcon *icon,
* g_loadable_icon_load_async:
* @icon: a #GLoadableIcon.
* @size: an integer.
- * @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
diff --git a/gio/gmemoryinputstream.c b/gio/gmemoryinputstream.c
index b205119..c77aeb7 100644
--- a/gio/gmemoryinputstream.c
+++ b/gio/gmemoryinputstream.c
@@ -186,7 +186,7 @@ g_memory_input_stream_new (void)
* g_memory_input_stream_new_from_data:
* @data: (array length=len) (element-type guint8) (transfer full): input data
* @len: length of the data, may be -1 if @data is a nul-terminated string
- * @destroy: (allow-none): function that is called to free @data, or %NULL
+ * @destroy: (nullable): function that is called to free @data, or %NULL
*
* Creates a new #GMemoryInputStream with data in memory of a given size.
*
@@ -236,7 +236,7 @@ g_memory_input_stream_new_from_bytes (GBytes *bytes)
* @stream: a #GMemoryInputStream
* @data: (array length=len) (element-type guint8) (transfer full): input data
* @len: length of the data, may be -1 if @data is a nul-terminated string
- * @destroy: (allow-none): function that is called to free @data, or %NULL
+ * @destroy: (nullable): function that is called to free @data, or %NULL
*
* Appends @data to data that can be read from the input stream
*/
diff --git a/gio/gmemoryoutputstream.c b/gio/gmemoryoutputstream.c
index 9f6e766..44720f1 100644
--- a/gio/gmemoryoutputstream.c
+++ b/gio/gmemoryoutputstream.c
@@ -330,11 +330,11 @@ g_memory_output_stream_init (GMemoryOutputStream *stream)
/**
* g_memory_output_stream_new: (skip)
- * @data: (allow-none): pointer to a chunk of memory to use, or %NULL
+ * @data: (nullable): pointer to a chunk of memory to use, or %NULL
* @size: the size of @data
- * @realloc_function: (allow-none): a function with realloc() semantics (like g_realloc())
+ * @realloc_function: (nullable): a function with realloc() semantics (like g_realloc())
* to be called when @data needs to be grown, or %NULL
- * @destroy_function: (allow-none): a function to be called on @data when the stream is
+ * @destroy_function: (nullable): a function to be called on @data when the stream is
* finalized, or %NULL
*
* Creates a new #GMemoryOutputStream.
diff --git a/gio/gmenu.c b/gio/gmenu.c
index e90fb14..b1f99d4 100644
--- a/gio/gmenu.c
+++ b/gio/gmenu.c
@@ -253,8 +253,8 @@ g_menu_new (void)
* g_menu_insert:
* @menu: a #GMenu
* @position: the position at which to insert the item
- * @label: (allow-none): the section label, or %NULL
- * @detailed_action: (allow-none): the detailed action string, or %NULL
+ * @label: (nullable): the section label, or %NULL
+ * @detailed_action: (nullable): the detailed action string, or %NULL
*
* Convenience function for inserting a normal menu item into @menu.
* Combine g_menu_item_new() and g_menu_insert_item() for a more flexible
@@ -278,8 +278,8 @@ g_menu_insert (GMenu *menu,
/**
* g_menu_prepend:
* @menu: a #GMenu
- * @label: (allow-none): the section label, or %NULL
- * @detailed_action: (allow-none): the detailed action string, or %NULL
+ * @label: (nullable): the section label, or %NULL
+ * @detailed_action: (nullable): the detailed action string, or %NULL
*
* Convenience function for prepending a normal menu item to the start
* of @menu. Combine g_menu_item_new() and g_menu_insert_item() for a more
@@ -298,8 +298,8 @@ g_menu_prepend (GMenu *menu,
/**
* g_menu_append:
* @menu: a #GMenu
- * @label: (allow-none): the section label, or %NULL
- * @detailed_action: (allow-none): the detailed action string, or %NULL
+ * @label: (nullable): the section label, or %NULL
+ * @detailed_action: (nullable): the detailed action string, or %NULL
*
* Convenience function for appending a normal menu item to the end of
* @menu. Combine g_menu_item_new() and g_menu_insert_item() for a more
@@ -319,7 +319,7 @@ g_menu_append (GMenu *menu,
* g_menu_insert_section:
* @menu: a #GMenu
* @position: the position at which to insert the item
- * @label: (allow-none): the section label, or %NULL
+ * @label: (nullable): the section label, or %NULL
* @section: a #GMenuModel with the items of the section
*
* Convenience function for inserting a section menu item into @menu.
@@ -345,7 +345,7 @@ g_menu_insert_section (GMenu *menu,
/**
* g_menu_prepend_section:
* @menu: a #GMenu
- * @label: (allow-none): the section label, or %NULL
+ * @label: (nullable): the section label, or %NULL
* @section: a #GMenuModel with the items of the section
*
* Convenience function for prepending a section menu item to the start
@@ -365,7 +365,7 @@ g_menu_prepend_section (GMenu *menu,
/**
* g_menu_append_section:
* @menu: a #GMenu
- * @label: (allow-none): the section label, or %NULL
+ * @label: (nullable): the section label, or %NULL
* @section: a #GMenuModel with the items of the section
*
* Convenience function for appending a section menu item to the end of
@@ -386,7 +386,7 @@ g_menu_append_section (GMenu *menu,
* g_menu_insert_submenu:
* @menu: a #GMenu
* @position: the position at which to insert the item
- * @label: (allow-none): the section label, or %NULL
+ * @label: (nullable): the section label, or %NULL
* @submenu: a #GMenuModel with the items of the submenu
*
* Convenience function for inserting a submenu menu item into @menu.
@@ -411,7 +411,7 @@ g_menu_insert_submenu (GMenu *menu,
/**
* g_menu_prepend_submenu:
* @menu: a #GMenu
- * @label: (allow-none): the section label, or %NULL
+ * @label: (nullable): the section label, or %NULL
* @submenu: a #GMenuModel with the items of the submenu
*
* Convenience function for prepending a submenu menu item to the start
@@ -431,7 +431,7 @@ g_menu_prepend_submenu (GMenu *menu,
/**
* g_menu_append_submenu:
* @menu: a #GMenu
- * @label: (allow-none): the section label, or %NULL
+ * @label: (nullable): the section label, or %NULL
* @submenu: a #GMenuModel with the items of the submenu
*
* Convenience function for appending a submenu menu item to the end of
@@ -643,7 +643,7 @@ valid_attribute_name (const gchar *name)
* g_menu_item_set_attribute_value:
* @menu_item: a #GMenuItem
* @attribute: the attribute to set
- * @value: (allow-none): a #GVariant to use as the value, or %NULL
+ * @value: (nullable): a #GVariant to use as the value, or %NULL
*
* Sets or unsets an attribute on @menu_item.
*
@@ -688,7 +688,7 @@ g_menu_item_set_attribute_value (GMenuItem *menu_item,
* g_menu_item_set_attribute:
* @menu_item: a #GMenuItem
* @attribute: the attribute to set
- * @format_string: (allow-none): a #GVariant format string, or %NULL
+ * @format_string: (nullable): a #GVariant format string, or %NULL
* @...: positional parameters, as per @format_string
*
* Sets or unsets an attribute on @menu_item.
@@ -737,7 +737,7 @@ g_menu_item_set_attribute (GMenuItem *menu_item,
* g_menu_item_set_link:
* @menu_item: a #GMenuItem
* @link: type of link to establish or unset
- * @model: (allow-none): the #GMenuModel to link to (or %NULL to unset)
+ * @model: (nullable): the #GMenuModel to link to (or %NULL to unset)
*
* Creates a link from @menu_item to @model if non-%NULL, or unsets it.
*
@@ -773,7 +773,7 @@ g_menu_item_set_link (GMenuItem *menu_item,
* g_menu_item_get_attribute_value:
* @menu_item: a #GMenuItem
* @attribute: the attribute name to query
- * @expected_type: (allow-none): the expected type of the attribute
+ * @expected_type: (nullable): the expected type of the attribute
*
* Queries the named @attribute on @menu_item.
*
@@ -890,7 +890,7 @@ g_menu_item_get_link (GMenuItem *menu_item,
/**
* g_menu_item_set_label:
* @menu_item: a #GMenuItem
- * @label: (allow-none): the label to set, or %NULL to unset
+ * @label: (nullable): the label to set, or %NULL to unset
*
* Sets or unsets the "label" attribute of @menu_item.
*
@@ -916,7 +916,7 @@ g_menu_item_set_label (GMenuItem *menu_item,
/**
* g_menu_item_set_submenu:
* @menu_item: a #GMenuItem
- * @submenu: (allow-none): a #GMenuModel, or %NULL
+ * @submenu: (nullable): a #GMenuModel, or %NULL
*
* Sets or unsets the "submenu" link of @menu_item to @submenu.
*
@@ -938,7 +938,7 @@ g_menu_item_set_submenu (GMenuItem *menu_item,
/**
* g_menu_item_set_section:
* @menu_item: a #GMenuItem
- * @section: (allow-none): a #GMenuModel, or %NULL
+ * @section: (nullable): a #GMenuModel, or %NULL
*
* Sets or unsets the "section" link of @menu_item to @section.
*
@@ -960,8 +960,8 @@ g_menu_item_set_section (GMenuItem *menu_item,
/**
* g_menu_item_set_action_and_target_value:
* @menu_item: a #GMenuItem
- * @action: (allow-none): the name of the action for this item
- * @target_value: (allow-none): a #GVariant to use as the action target
+ * @action: (nullable): the name of the action for this item
+ * @target_value: (nullable): a #GVariant to use as the action target
*
* Sets or unsets the "action" and "target" attributes of @menu_item.
*
@@ -1026,8 +1026,8 @@ g_menu_item_set_action_and_target_value (GMenuItem *menu_item,
/**
* g_menu_item_set_action_and_target:
* @menu_item: a #GMenuItem
- * @action: (allow-none): the name of the action for this item
- * @format_string: (allow-none): a GVariant format string
+ * @action: (nullable): the name of the action for this item
+ * @format_string: (nullable): a GVariant format string
* @...: positional parameters, as per @format_string
*
* Sets or unsets the "action" and "target" attributes of @menu_item.
@@ -1112,8 +1112,8 @@ g_menu_item_set_detailed_action (GMenuItem *menu_item,
/**
* g_menu_item_new:
- * @label: (allow-none): the section label, or %NULL
- * @detailed_action: (allow-none): the detailed action string, or %NULL
+ * @label: (nullable): the section label, or %NULL
+ * @detailed_action: (nullable): the detailed action string, or %NULL
*
* Creates a new #GMenuItem.
*
@@ -1147,7 +1147,7 @@ g_menu_item_new (const gchar *label,
/**
* g_menu_item_new_submenu:
- * @label: (allow-none): the section label, or %NULL
+ * @label: (nullable): the section label, or %NULL
* @submenu: a #GMenuModel with the items of the submenu
*
* Creates a new #GMenuItem representing a submenu.
@@ -1177,7 +1177,7 @@ g_menu_item_new_submenu (const gchar *label,
/**
* g_menu_item_new_section:
- * @label: (allow-none): the section label, or %NULL
+ * @label: (nullable): the section label, or %NULL
* @section: a #GMenuModel with the items of the section
*
* Creates a new #GMenuItem representing a section.
diff --git a/gio/gmenumodel.c b/gio/gmenumodel.c
index 4ffe21f..318358f 100644
--- a/gio/gmenumodel.c
+++ b/gio/gmenumodel.c
@@ -521,7 +521,7 @@ g_menu_model_iterate_item_attributes (GMenuModel *model,
* @model: a #GMenuModel
* @item_index: the index of the item
* @attribute: the attribute to query
- * @expected_type: (allow-none): the expected type of the attribute, or
+ * @expected_type: (nullable): the expected type of the attribute, or
* %NULL
*
* Queries the item at position @item_index in @model for the attribute
@@ -702,8 +702,8 @@ G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GMenuAttributeIter, g_menu_attribute_iter,
/**
* g_menu_attribute_iter_get_next:
* @iter: a #GMenuAttributeIter
- * @out_name: (out) (allow-none) (transfer none): the type of the attribute
- * @value: (out) (allow-none) (transfer full): the attribute value
+ * @out_name: (out) (optional) (transfer none): the type of the attribute
+ * @value: (out) (optional) (transfer full): the attribute value
*
* This function combines g_menu_attribute_iter_next() with
* g_menu_attribute_iter_get_name() and g_menu_attribute_iter_get_value().
@@ -858,8 +858,8 @@ G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GMenuLinkIter, g_menu_link_iter, G_TYPE_OBJ
/**
* g_menu_link_iter_get_next:
* @iter: a #GMenuLinkIter
- * @out_link: (out) (allow-none) (transfer none): the name of the link
- * @value: (out) (allow-none) (transfer full): the linked #GMenuModel
+ * @out_link: (out) (optional) (transfer none): the name of the link
+ * @value: (out) (optional) (transfer full): the linked #GMenuModel
*
* This function combines g_menu_link_iter_next() with
* g_menu_link_iter_get_name() and g_menu_link_iter_get_value().
diff --git a/gio/gmount.c b/gio/gmount.c
index 1758775..d585663 100644
--- a/gio/gmount.c
+++ b/gio/gmount.c
@@ -359,8 +359,8 @@ g_mount_can_eject (GMount *mount)
* g_mount_unmount:
* @mount: a #GMount.
* @flags: flags affecting the operation
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
+ * @callback: (nullable): a #GAsyncReadyCallback, or %NULL.
* @user_data: user data passed to @callback.
*
* Unmounts a mount. This is an asynchronous operation, and is
@@ -435,8 +435,8 @@ g_mount_unmount_finish (GMount *mount,
* g_mount_eject:
* @mount: a #GMount.
* @flags: flags affecting the unmount if required for eject
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
+ * @callback: (nullable): a #GAsyncReadyCallback, or %NULL.
* @user_data: user data passed to @callback.
*
* Ejects a mount. This is an asynchronous operation, and is
@@ -510,10 +510,10 @@ g_mount_eject_finish (GMount *mount,
* g_mount_unmount_with_operation:
* @mount: a #GMount.
* @flags: flags affecting the operation
- * @mount_operation: (allow-none): a #GMountOperation or %NULL to avoid
+ * @mount_operation: (nullable): a #GMountOperation or %NULL to avoid
* user interaction.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
+ * @callback: (nullable): a #GAsyncReadyCallback, or %NULL.
* @user_data: user data passed to @callback.
*
* Unmounts a mount. This is an asynchronous operation, and is
@@ -595,10 +595,10 @@ g_mount_unmount_with_operation_finish (GMount *mount,
* g_mount_eject_with_operation:
* @mount: a #GMount.
* @flags: flags affecting the unmount if required for eject
- * @mount_operation: (allow-none): a #GMountOperation or %NULL to avoid
+ * @mount_operation: (nullable): a #GMountOperation or %NULL to avoid
* user interaction.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
+ * @callback: (nullable): a #GAsyncReadyCallback, or %NULL.
* @user_data: user data passed to @callback.
*
* Ejects a mount. This is an asynchronous operation, and is
@@ -679,10 +679,10 @@ g_mount_eject_with_operation_finish (GMount *mount,
* g_mount_remount:
* @mount: a #GMount.
* @flags: flags affecting the operation
- * @mount_operation: (allow-none): a #GMountOperation or %NULL to avoid
+ * @mount_operation: (nullable): a #GMountOperation or %NULL to avoid
* user interaction.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
+ * @callback: (nullable): a #GAsyncReadyCallback, or %NULL.
* @user_data: user data passed to @callback.
*
* Remounts a mount. This is an asynchronous operation, and is
@@ -760,7 +760,7 @@ g_mount_remount_finish (GMount *mount,
* @mount: a #GMount
* @force_rescan: Whether to force a rescan of the content.
* Otherwise a cached result will be used if available
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore
* @callback: a #GAsyncReadyCallback
* @user_data: user data passed to @callback
*
@@ -848,7 +848,7 @@ g_mount_guess_content_type_finish (GMount *mount,
* @mount: a #GMount
* @force_rescan: Whether to force a rescan of the content.
* Otherwise a cached result will be used if available
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore
* @error: a #GError location to store the error occurring, or %NULL to
* ignore
*
diff --git a/gio/gnetworkmonitor.c b/gio/gnetworkmonitor.c
index 3362c7f..c59caee 100644
--- a/gio/gnetworkmonitor.c
+++ b/gio/gnetworkmonitor.c
@@ -176,7 +176,7 @@ g_network_monitor_get_connectivity (GNetworkMonitor *monitor)
* g_network_monitor_can_reach:
* @monitor: a #GNetworkMonitor
* @connectable: a #GSocketConnectable
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @error: return location for a #GError, or %NULL
*
* Attempts to determine whether or not the host pointed to by
@@ -237,7 +237,7 @@ g_network_monitor_real_can_reach_async (GNetworkMonitor *monitor,
* g_network_monitor_can_reach_async:
* @monitor: a #GNetworkMonitor
* @connectable: a #GSocketConnectable
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @callback: (scope async): a #GAsyncReadyCallback to call when the
* request is satisfied
* @user_data: (closure): the data to pass to callback function
diff --git a/gio/gnotification.c b/gio/gnotification.c
index 2cf03cf..bdf0532 100644
--- a/gio/gnotification.c
+++ b/gio/gnotification.c
@@ -214,7 +214,7 @@ g_notification_set_title (GNotification *notification,
*
* Gets the current body of @notification.
*
- * Returns: (allow-none): the body of @notification
+ * Returns: (nullable): the body of @notification
*
* Since: 2.40
*/
@@ -229,7 +229,7 @@ g_notification_get_body (GNotification *notification)
/**
* g_notification_set_body:
* @notification: a #GNotification
- * @body: (allow-none): the new body for @notification, or %NULL
+ * @body: (nullable): the new body for @notification, or %NULL
*
* Sets the body of @notification to @body.
*
@@ -384,7 +384,7 @@ g_notification_add_button (GNotification *notification,
* @notification: a #GNotification
* @label: label of the button
* @action: an action name
- * @target_format: (allow-none): a #GVariant format string, or %NULL
+ * @target_format: (nullable): a #GVariant format string, or %NULL
* @...: positional parameters, as determined by @target_format
*
* Adds a button to @notification that activates @action when clicked.
@@ -422,7 +422,7 @@ g_notification_add_button_with_target (GNotification *notification,
* @notification: a #GNotification
* @label: label of the button
* @action: an action name
- * @target: (allow-none): a #GVariant to use as @action's parameter, or %NULL
+ * @target: (nullable): a #GVariant to use as @action's parameter, or %NULL
*
* Adds a button to @notification that activates @action when clicked.
* @action must be an application-wide action (it must start with "app.").
@@ -538,8 +538,8 @@ g_notification_get_button_with_action (GNotification *notification,
/*< private >
* g_notification_get_default_action:
* @notification: a #GNotification
- * @action: (allow-none): return location for the default action
- * @target: (allow-none): return location for the target of the default action
+ * @action: (nullable): return location for the default action
+ * @target: (nullable): return location for the target of the default action
*
* Gets the action and target for the default action of @notification.
*
@@ -612,7 +612,7 @@ g_notification_set_default_action (GNotification *notification,
* g_notification_set_default_action_and_target: (skip)
* @notification: a #GNotification
* @action: an action name
- * @target_format: (allow-none): a #GVariant format string, or %NULL
+ * @target_format: (nullable): a #GVariant format string, or %NULL
* @...: positional parameters, as determined by @target_format
*
* Sets the default action of @notification to @action. This action is
@@ -652,7 +652,7 @@ g_notification_set_default_action_and_target (GNotification *notification,
* g_notification_set_default_action_and_target_value: (rename-to
g_notification_set_default_action_and_target)
* @notification: a #GNotification
* @action: an action name
- * @target: (allow-none): a #GVariant to use as @action's parameter, or %NULL
+ * @target: (nullable): a #GVariant to use as @action's parameter, or %NULL
*
* Sets the default action of @notification to @action. This action is
* activated when the notification is clicked on. It must be an
diff --git a/gio/goutputstream.c b/gio/goutputstream.c
index 8e8172f..3d4fa98 100644
--- a/gio/goutputstream.c
+++ b/gio/goutputstream.c
@@ -153,7 +153,7 @@ g_output_stream_init (GOutputStream *stream)
* @stream: a #GOutputStream.
* @buffer: (array length=count) (element-type guint8): the buffer containing the data to write.
* @count: the number of bytes to write
- * @cancellable: (allow-none): optional cancellable object
+ * @cancellable: (nullable): optional cancellable object
* @error: location to store the error occurring, or %NULL to ignore
*
* Tries to write @count bytes from @buffer into the stream. Will block
@@ -236,7 +236,7 @@ g_output_stream_write (GOutputStream *stream,
* @count: the number of bytes to write
* @bytes_written: (out): location to store the number of bytes that was
* written to the stream
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: location to store the error occurring, or %NULL to ignore
*
* Tries to write @count bytes from @buffer into the stream. Will block
@@ -304,7 +304,7 @@ g_output_stream_write_all (GOutputStream *stream,
* @stream: a #GOutputStream.
* @bytes_written: (out): location to store the number of bytes that was
* written to the stream
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: location to store the error occurring, or %NULL to ignore
* @format: the format string. See the printf() documentation
* @...: the parameters to insert into the format string
@@ -350,7 +350,7 @@ g_output_stream_printf (GOutputStream *stream,
* @stream: a #GOutputStream.
* @bytes_written: (out): location to store the number of bytes that was
* written to the stream
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: location to store the error occurring, or %NULL to ignore
* @format: the format string. See the printf() documentation
* @args: the parameters to insert into the format string
@@ -401,7 +401,7 @@ g_output_stream_vprintf (GOutputStream *stream,
* g_output_stream_write_bytes:
* @stream: a #GOutputStream.
* @bytes: the #GBytes to write
- * @cancellable: (allow-none): optional cancellable object
+ * @cancellable: (nullable): optional cancellable object
* @error: location to store the error occurring, or %NULL to ignore
*
* A wrapper function for g_output_stream_write() which takes a
@@ -438,7 +438,7 @@ g_output_stream_write_bytes (GOutputStream *stream,
/**
* g_output_stream_flush:
* @stream: a #GOutputStream.
- * @cancellable: (allow-none): optional cancellable object
+ * @cancellable: (nullable): optional cancellable object
* @error: location to store the error occurring, or %NULL to ignore
*
* Forces a write of all user-space buffered data for the given
@@ -490,7 +490,7 @@ g_output_stream_flush (GOutputStream *stream,
* @stream: a #GOutputStream.
* @source: a #GInputStream.
* @flags: a set of #GOutputStreamSpliceFlags.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: a #GError location to store the error occurring, or %NULL to
* ignore.
*
@@ -670,7 +670,7 @@ g_output_stream_internal_close (GOutputStream *stream,
/**
* g_output_stream_close:
* @stream: A #GOutputStream.
- * @cancellable: (allow-none): optional cancellable object
+ * @cancellable: (nullable): optional cancellable object
* @error: location to store the error occurring, or %NULL to ignore
*
* Closes the stream, releasing resources related to it.
@@ -761,7 +761,7 @@ async_ready_write_callback_wrapper (GObject *source_object,
* @buffer: (array length=count) (element-type guint8): the buffer containing the data to write.
* @count: the number of bytes to write
* @io_priority: the io priority of the request.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @callback: (scope async): callback to call when the request is satisfied
* @user_data: (closure): the data to pass to callback function
*
@@ -956,7 +956,7 @@ write_all_async_thread (GTask *task,
* @buffer: (array length=count) (element-type guint8): the buffer containing the data to write
* @count: the number of bytes to write
* @io_priority: the io priority of the request
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore
* @callback: (scope async): callback to call when the request is satisfied
* @user_data: (closure): the data to pass to callback function
*
@@ -1083,7 +1083,7 @@ write_bytes_callback (GObject *stream,
* @stream: A #GOutputStream.
* @bytes: The bytes to write
* @io_priority: the io priority of the request.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @callback: (scope async): callback to call when the request is satisfied
* @user_data: (closure): the data to pass to callback function
*
@@ -1184,7 +1184,7 @@ async_ready_splice_callback_wrapper (GObject *source_object,
* @source: a #GInputStream.
* @flags: a set of #GOutputStreamSpliceFlags.
* @io_priority: the io priority of the request.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @callback: (scope async): a #GAsyncReadyCallback.
* @user_data: (closure): user data passed to @callback.
*
@@ -1300,7 +1300,7 @@ async_ready_flush_callback_wrapper (GObject *source_object,
* g_output_stream_flush_async:
* @stream: a #GOutputStream.
* @io_priority: the io priority of the request.
- * @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
*
@@ -1458,7 +1458,7 @@ real_close_async_cb (GObject *source_object,
* g_output_stream_close_async:
* @stream: A #GOutputStream.
* @io_priority: the io priority of the request.
- * @cancellable: (allow-none): optional cancellable object
+ * @cancellable: (nullable): optional cancellable object
* @callback: (scope async): callback to call when the request is satisfied
* @user_data: (closure): the data to pass to callback function
*
diff --git a/gio/gpermission.c b/gio/gpermission.c
index 6f3f2c2..0c021da 100644
--- a/gio/gpermission.c
+++ b/gio/gpermission.c
@@ -78,7 +78,7 @@ G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GPermission, g_permission, G_TYPE_OBJECT)
/**
* g_permission_acquire:
* @permission: a #GPermission instance
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @error: a pointer to a %NULL #GError, or %NULL
*
* Attempts to acquire the permission represented by @permission.
@@ -114,7 +114,7 @@ g_permission_acquire (GPermission *permission,
/**
* g_permission_acquire_async:
* @permission: a #GPermission instance
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @callback: the #GAsyncReadyCallback to call when done
* @user_data: the user data to pass to @callback
*
@@ -165,7 +165,7 @@ g_permission_acquire_finish (GPermission *permission,
/**
* g_permission_release:
* @permission: a #GPermission instance
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @error: a pointer to a %NULL #GError, or %NULL
*
* Attempts to release the permission represented by @permission.
@@ -201,7 +201,7 @@ g_permission_release (GPermission *permission,
/**
* g_permission_release_async:
* @permission: a #GPermission instance
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @callback: the #GAsyncReadyCallback to call when done
* @user_data: the user data to pass to @callback
*
diff --git a/gio/gpollableinputstream.c b/gio/gpollableinputstream.c
index 45947a4..2a43ea4 100644
--- a/gio/gpollableinputstream.c
+++ b/gio/gpollableinputstream.c
@@ -114,7 +114,7 @@ g_pollable_input_stream_is_readable (GPollableInputStream *stream)
/**
* g_pollable_input_stream_create_source:
* @stream: a #GPollableInputStream.
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
*
* Creates a #GSource that triggers when @stream can be read, or
* @cancellable is triggered or an error occurs. The callback on the
@@ -162,7 +162,7 @@ g_pollable_input_stream_default_read_nonblocking (GPollableInputStream *stream,
* @buffer: (array length=count) (element-type guint8): a buffer to
* read data into (which should be at least @count bytes long).
* @count: the number of bytes you want to read
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @error: #GError for error reporting, or %NULL to ignore.
*
* Attempts to read up to @count bytes from @stream into @buffer, as
diff --git a/gio/gpollableoutputstream.c b/gio/gpollableoutputstream.c
index c16b90a..24e1596 100644
--- a/gio/gpollableoutputstream.c
+++ b/gio/gpollableoutputstream.c
@@ -115,7 +115,7 @@ g_pollable_output_stream_is_writable (GPollableOutputStream *stream)
/**
* g_pollable_output_stream_create_source:
* @stream: a #GPollableOutputStream.
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
*
* Creates a #GSource that triggers when @stream can be written, or
* @cancellable is triggered or an error occurs. The callback on the
@@ -163,7 +163,7 @@ g_pollable_output_stream_default_write_nonblocking (GPollableOutputStream *stre
* @buffer: (array length=count) (element-type guint8): a buffer to write
* data from
* @count: the number of bytes you want to write
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @error: #GError for error reporting, or %NULL to ignore.
*
* Attempts to write up to @count bytes from @buffer to @stream, as
diff --git a/gio/gpollableutils.c b/gio/gpollableutils.c
index 58313a7..84e4ecd 100644
--- a/gio/gpollableutils.c
+++ b/gio/gpollableutils.c
@@ -126,8 +126,8 @@ g_pollable_source_new (GObject *pollable_stream)
* g_pollable_source_new_full:
* @pollable_stream: (type GObject): the stream associated with the
* new source
- * @child_source: (allow-none): optional child source to attach
- * @cancellable: (allow-none): optional #GCancellable to attach
+ * @child_source: (nullable): optional child source to attach
+ * @cancellable: (nullable): optional #GCancellable to attach
*
* Utility method for #GPollableInputStream and #GPollableOutputStream
* implementations. Creates a new #GSource, as with
@@ -173,7 +173,7 @@ g_pollable_source_new_full (gpointer pollable_stream,
* read data into
* @count: the number of bytes to read
* @blocking: whether to do blocking I/O
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: location to store the error occurring, or %NULL to ignore
*
* Tries to read from @stream, as with g_input_stream_read() (if
@@ -219,7 +219,7 @@ g_pollable_stream_read (GInputStream *stream,
* containing the data to write.
* @count: the number of bytes to write
* @blocking: whether to do blocking I/O
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: location to store the error occurring, or %NULL to ignore
*
* Tries to write to @stream, as with g_output_stream_write() (if
@@ -268,7 +268,7 @@ g_pollable_stream_write (GOutputStream *stream,
* @blocking: whether to do blocking I/O
* @bytes_written: (out): location to store the number of bytes that was
* written to the stream
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: location to store the error occurring, or %NULL to ignore
*
* Tries to write @count bytes to @stream, as with
diff --git a/gio/gproxy.c b/gio/gproxy.c
index bf5b1e2..9419d57 100644
--- a/gio/gproxy.c
+++ b/gio/gproxy.c
@@ -84,7 +84,7 @@ g_proxy_get_default_for_protocol (const gchar *protocol)
* @proxy: a #GProxy
* @connection: a #GIOStream
* @proxy_address: a #GProxyAddress
- * @cancellable: (allow-none): a #GCancellable
+ * @cancellable: (nullable): a #GCancellable
* @error: return #GError
*
* Given @connection to communicate with a proxy (eg, a
@@ -123,7 +123,7 @@ g_proxy_connect (GProxy *proxy,
* @proxy: a #GProxy
* @connection: a #GIOStream
* @proxy_address: a #GProxyAddress
- * @cancellable: (allow-none): a #GCancellable
+ * @cancellable: (nullable): a #GCancellable
* @callback: (scope async): a #GAsyncReadyCallback
* @user_data: (closure): callback data
*
diff --git a/gio/gproxyaddress.c b/gio/gproxyaddress.c
index 0d263fb..9e3adc4 100644
--- a/gio/gproxyaddress.c
+++ b/gio/gproxyaddress.c
@@ -297,9 +297,9 @@ g_proxy_address_init (GProxyAddress *proxy)
* @protocol: The proxy protocol to support, in lower case (e.g. socks, http).
* @dest_hostname: The destination hostname the proxy should tunnel to.
* @dest_port: The destination port to tunnel to.
- * @username: (allow-none): The username to authenticate to the proxy server
+ * @username: (nullable): The username to authenticate to the proxy server
* (or %NULL).
- * @password: (allow-none): The password to authenticate to the proxy server
+ * @password: (nullable): The password to authenticate to the proxy server
* (or %NULL).
*
* Creates a new #GProxyAddress for @inetaddr with @protocol that should
diff --git a/gio/gproxyresolver.c b/gio/gproxyresolver.c
index d5b19fd..c9418ce 100644
--- a/gio/gproxyresolver.c
+++ b/gio/gproxyresolver.c
@@ -105,7 +105,7 @@ g_proxy_resolver_is_supported (GProxyResolver *resolver)
* g_proxy_resolver_lookup:
* @resolver: a #GProxyResolver
* @uri: a URI representing the destination to connect to
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @error: return location for a #GError, or %NULL
*
* Looks into the system proxy configuration to determine what proxy,
@@ -150,7 +150,7 @@ g_proxy_resolver_lookup (GProxyResolver *resolver,
* g_proxy_resolver_lookup_async:
* @resolver: a #GProxyResolver
* @uri: a URI representing the destination to connect to
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @callback: (scope async): callback to call after resolution completes
* @user_data: (closure): data for @callback
*
diff --git a/gio/gremoteactiongroup.c b/gio/gremoteactiongroup.c
index ad0655c..451c3e9 100644
--- a/gio/gremoteactiongroup.c
+++ b/gio/gremoteactiongroup.c
@@ -87,7 +87,7 @@ g_remote_action_group_default_init (GRemoteActionGroupInterface *iface)
* g_remote_action_group_activate_action_full:
* @remote: a #GDBusActionGroup
* @action_name: the name of the action to activate
- * @parameter: (allow-none): the optional parameter to the activation
+ * @parameter: (nullable): the optional parameter to the activation
* @platform_data: the platform data to send
*
* Activates the remote action.
diff --git a/gio/gresolver.c b/gio/gresolver.c
index 9b931bb..3b4e6c4 100644
--- a/gio/gresolver.c
+++ b/gio/gresolver.c
@@ -350,7 +350,7 @@ handle_ip_address (const char *hostname,
* g_resolver_lookup_by_name:
* @resolver: a #GResolver
* @hostname: the hostname to look up
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @error: return location for a #GError, or %NULL
*
* Synchronously resolves @hostname to determine its associated IP
@@ -417,7 +417,7 @@ g_resolver_lookup_by_name (GResolver *resolver,
* g_resolver_lookup_by_name_async:
* @resolver: a #GResolver
* @hostname: the hostname to look up the address of
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @callback: (scope async): callback to call after resolution completes
* @user_data: (closure): data for @callback
*
@@ -536,7 +536,7 @@ g_resolver_free_addresses (GList *addresses)
* g_resolver_lookup_by_address:
* @resolver: a #GResolver
* @address: the address to reverse-resolve
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @error: return location for a #GError, or %NULL
*
* Synchronously reverse-resolves @address to determine its
@@ -572,7 +572,7 @@ g_resolver_lookup_by_address (GResolver *resolver,
* g_resolver_lookup_by_address_async:
* @resolver: a #GResolver
* @address: the address to reverse-resolve
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @callback: (scope async): callback to call after resolution completes
* @user_data: (closure): data for @callback
*
@@ -651,7 +651,7 @@ g_resolver_get_service_rrname (const char *service,
* @service: the service type to look up (eg, "ldap")
* @protocol: the networking protocol to use for @service (eg, "tcp")
* @domain: the DNS domain to look up the service in
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @error: return location for a #GError, or %NULL
*
* Synchronously performs a DNS SRV lookup for the given @service and
@@ -715,7 +715,7 @@ g_resolver_lookup_service (GResolver *resolver,
* @service: the service type to look up (eg, "ldap")
* @protocol: the networking protocol to use for @service (eg, "tcp")
* @domain: the DNS domain to look up the service in
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @callback: (scope async): callback to call after resolution completes
* @user_data: (closure): data for @callback
*
@@ -811,7 +811,7 @@ g_resolver_free_targets (GList *targets)
* @resolver: a #GResolver
* @rrname: the DNS name to lookup the record for
* @record_type: the type of DNS record to lookup
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @error: return location for a #GError, or %NULL
*
* Synchronously performs a DNS record lookup for the given @rrname and returns
@@ -856,7 +856,7 @@ g_resolver_lookup_records (GResolver *resolver,
* @resolver: a #GResolver
* @rrname: the DNS name to lookup the record for
* @record_type: the type of DNS record to lookup
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @callback: (scope async): callback to call after resolution completes
* @user_data: (closure): data for @callback
*
diff --git a/gio/gresource.c b/gio/gresource.c
index d613740..7805e37 100644
--- a/gio/gresource.c
+++ b/gio/gresource.c
@@ -784,9 +784,9 @@ g_resource_lookup_data (GResource *resource,
* @resource: A #GResource
* @path: A pathname inside the resource
* @lookup_flags: A #GResourceLookupFlags
- * @size: (out) (allow-none): a location to place the length of the contents of the file,
+ * @size: (out) (optional): a location to place the length of the contents of the file,
* or %NULL if the length is not needed
- * @flags: (out) (allow-none): a location to place the flags about the file,
+ * @flags: (out) (optional): a location to place the flags about the file,
* or %NULL if the length is not needed
* @error: return location for a #GError, or %NULL
*
@@ -1147,9 +1147,9 @@ g_resources_enumerate_children (const gchar *path,
* g_resources_get_info:
* @path: A pathname inside the resource
* @lookup_flags: A #GResourceLookupFlags
- * @size: (out) (allow-none): a location to place the length of the contents of the file,
+ * @size: (out) (optional): a location to place the length of the contents of the file,
* or %NULL if the length is not needed
- * @flags: (out) (allow-none): a location to place the flags about the file,
+ * @flags: (out) (optional): a location to place the flags about the file,
* or %NULL if the length is not needed
* @error: return location for a #GError, or %NULL
*
diff --git a/gio/gseekable.c b/gio/gseekable.c
index 3d89591..c1f6789 100644
--- a/gio/gseekable.c
+++ b/gio/gseekable.c
@@ -98,7 +98,7 @@ g_seekable_can_seek (GSeekable *seekable)
* @seekable: a #GSeekable.
* @offset: a #goffset.
* @type: a #GSeekType.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: a #GError location to store the error occurring, or %NULL to
* ignore.
*
@@ -161,7 +161,7 @@ g_seekable_can_truncate (GSeekable *seekable)
* g_seekable_truncate:
* @seekable: a #GSeekable.
* @offset: a #goffset.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: a #GError location to store the error occurring, or %NULL to
* ignore.
*
diff --git a/gio/gsettings.c b/gio/gsettings.c
index ea1b88c..2b974e9 100644
--- a/gio/gsettings.c
+++ b/gio/gsettings.c
@@ -744,7 +744,7 @@ g_settings_class_init (GSettingsClass *class)
/**
* GSettings::change-event:
* @settings: the object on which the signal was emitted
- * @keys: (array length=n_keys) (element-type GQuark) (allow-none):
+ * @keys: (array length=n_keys) (element-type GQuark) (nullable):
* an array of #GQuarks for the changed keys, or %NULL
* @n_keys: the length of the @keys array, or 0
*
@@ -1084,8 +1084,8 @@ g_settings_new_with_backend_and_path (const gchar *schema_id,
/**
* g_settings_new_full:
* @schema: a #GSettingsSchema
- * @backend: (allow-none): a #GSettingsBackend
- * @path: (allow-none): the path to use
+ * @backend: (nullable): a #GSettingsBackend
+ * @path: (nullable): the path to use
*
* Creates a new #GSettings object with a given schema, backend and
* path.
@@ -1238,7 +1238,7 @@ g_settings_get_value (GSettings *settings,
* It is a programmer error to give a @key that isn't contained in the
* schema for @settings.
*
- * Returns: (allow-none) (transfer full): the user's value, if set
+ * Returns: (nullable) (transfer full): the user's value, if set
*
* Since: 2.40
**/
@@ -1286,7 +1286,7 @@ g_settings_get_user_value (GSettings *settings,
* It is a programmer error to give a @key that isn't contained in the
* schema for @settings.
*
- * Returns: (allow-none) (transfer full): the default value
+ * Returns: (nullable) (transfer full): the default value
*
* Since: 2.40
**/
@@ -2194,7 +2194,7 @@ g_settings_get_strv (GSettings *settings,
* g_settings_set_strv:
* @settings: a #GSettings object
* @key: the name of the key to set
- * @value: (allow-none) (array zero-terminated=1): the value to set it to, or %NULL
+ * @value: (nullable) (array zero-terminated=1): the value to set it to, or %NULL
*
* Sets @key in @settings to @value.
*
diff --git a/gio/gsettingsbackend.c b/gio/gsettingsbackend.c
index f211e2c..62d75e2 100644
--- a/gio/gsettingsbackend.c
+++ b/gio/gsettingsbackend.c
@@ -173,7 +173,7 @@ g_settings_backend_watch_weak_notify (gpointer data,
* g_settings_backend_watch:
* @backend: a #GSettingsBackend
* @target: the GObject (typically GSettings instance) to call back to
- * @context: (allow-none): a #GMainContext, or %NULL
+ * @context: (nullable): a #GMainContext, or %NULL
* ...: callbacks...
*
* Registers a new watch on a #GSettingsBackend.
@@ -586,7 +586,7 @@ g_settings_backend_flatten_one (gpointer key,
* @path: (out): the location to save the path
* @keys: (out) (transfer container) (array zero-terminated=1): the
* location to save the relative keys
- * @values: (out) (allow-none) (transfer container) (array zero-terminated=1):
+ * @values: (out) (optional) (transfer container) (array zero-terminated=1):
* the location to save the values, or %NULL
*
* Calculate the longest common prefix of all keys in a tree and write
diff --git a/gio/gsettingsschema.c b/gio/gsettingsschema.c
index ee31f81..15941f7 100644
--- a/gio/gsettingsschema.c
+++ b/gio/gsettingsschema.c
@@ -247,7 +247,7 @@ g_settings_schema_source_unref (GSettingsSchemaSource *source)
/**
* g_settings_schema_source_new_from_directory:
* @directory: (type filename): the filename of a directory
- * @parent: (allow-none): a #GSettingsSchemaSource, or %NULL
+ * @parent: (nullable): a #GSettingsSchemaSource, or %NULL
* @trusted: %TRUE, if the directory is trusted
* @error: a pointer to a #GError pointer set to %NULL, or %NULL
*
diff --git a/gio/gsimpleaction.c b/gio/gsimpleaction.c
index 2c0bc85..ccc8f30 100644
--- a/gio/gsimpleaction.c
+++ b/gio/gsimpleaction.c
@@ -371,7 +371,7 @@ g_simple_action_class_init (GSimpleActionClass *class)
/**
* GSimpleAction::activate:
* @simple: the #GSimpleAction
- * @parameter: (allow-none): the parameter to the activation
+ * @parameter: (nullable): the parameter to the activation
*
* Indicates that the action was just activated.
*
@@ -400,7 +400,7 @@ g_simple_action_class_init (GSimpleActionClass *class)
/**
* GSimpleAction::change-state:
* @simple: the #GSimpleAction
- * @value: (allow-none): the requested value for the state
+ * @value: (nullable): the requested value for the state
*
* Indicates that the action just received a request to change its
* state.
@@ -563,7 +563,7 @@ g_simple_action_set_enabled (GSimpleAction *simple,
/**
* g_simple_action_set_state_hint:
* @simple: a #GSimpleAction
- * @state_hint: (allow-none): a #GVariant representing the state hint
+ * @state_hint: (nullable): a #GVariant representing the state hint
*
* Sets the state hint for the action.
*
@@ -591,7 +591,7 @@ g_simple_action_set_state_hint (GSimpleAction *simple,
/**
* g_simple_action_new:
* @name: the name of the action
- * @parameter_type: (allow-none): the type of parameter to the activate function
+ * @parameter_type: (nullable): the type of parameter to the activate function
*
* Creates a new action.
*
@@ -616,7 +616,7 @@ g_simple_action_new (const gchar *name,
/**
* g_simple_action_new_stateful:
* @name: the name of the action
- * @parameter_type: (allow-none): the type of the parameter to the activate function
+ * @parameter_type: (nullable): the type of the parameter to the activate function
* @state: the initial state of the action
*
* Creates a new stateful action.
diff --git a/gio/gsimpleasyncresult.c b/gio/gsimpleasyncresult.c
index fdd83fc..ff2177e 100644
--- a/gio/gsimpleasyncresult.c
+++ b/gio/gsimpleasyncresult.c
@@ -290,7 +290,7 @@ g_simple_async_result_init (GSimpleAsyncResult *simple)
/**
* g_simple_async_result_new:
- * @source_object: (allow-none): a #GObject, or %NULL.
+ * @source_object: (nullable): a #GObject, or %NULL.
* @callback: (scope async): a #GAsyncReadyCallback.
* @user_data: (closure): user data passed to @callback.
* @source_tag: the asynchronous function.
@@ -334,7 +334,7 @@ g_simple_async_result_new (GObject *source_object,
/**
* g_simple_async_result_new_from_error:
- * @source_object: (allow-none): a #GObject, or %NULL.
+ * @source_object: (nullable): a #GObject, or %NULL.
* @callback: (scope async): a #GAsyncReadyCallback.
* @user_data: (closure): user data passed to @callback.
* @error: a #GError
@@ -365,7 +365,7 @@ g_simple_async_result_new_from_error (GObject *source_object,
/**
* g_simple_async_result_new_take_error: (skip)
- * @source_object: (allow-none): a #GObject, or %NULL
+ * @source_object: (nullable): a #GObject, or %NULL
* @callback: (scope async): a #GAsyncReadyCallback
* @user_data: (closure): user data passed to @callback
* @error: a #GError
@@ -399,7 +399,7 @@ g_simple_async_result_new_take_error (GObject *source_object,
/**
* g_simple_async_result_new_error:
- * @source_object: (allow-none): a #GObject, or %NULL.
+ * @source_object: (nullable): a #GObject, or %NULL.
* @callback: (scope async): a #GAsyncReadyCallback.
* @user_data: (closure): user data passed to @callback.
* @domain: a #GQuark.
@@ -915,7 +915,7 @@ run_in_thread (GIOSchedulerJob *job,
* @simple: a #GSimpleAsyncResult.
* @func: a #GSimpleAsyncThreadFunc.
* @io_priority: the io priority of the request.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
*
* Runs the asynchronous job in a separate thread and then calls
* g_simple_async_result_complete_in_idle() on @simple to return
@@ -951,8 +951,8 @@ g_simple_async_result_run_in_thread (GSimpleAsyncResult *simple,
/**
* g_simple_async_result_is_valid:
* @result: the #GAsyncResult passed to the _finish function.
- * @source: (allow-none): the #GObject passed to the _finish function.
- * @source_tag: (allow-none): the asynchronous function.
+ * @source: (nullable): the #GObject passed to the _finish function.
+ * @source_tag: (nullable): the asynchronous function.
*
* Ensures that the data passed to the _finish function of an async
* operation is consistent. Three checks are performed.
@@ -1003,7 +1003,7 @@ g_simple_async_result_is_valid (GAsyncResult *result,
/**
* g_simple_async_report_error_in_idle: (skip)
- * @object: (allow-none): a #GObject, or %NULL.
+ * @object: (nullable): a #GObject, or %NULL.
* @callback: a #GAsyncReadyCallback.
* @user_data: user data passed to @callback.
* @domain: a #GQuark containing the error domain (usually #G_IO_ERROR).
@@ -1046,7 +1046,7 @@ g_simple_async_report_error_in_idle (GObject *object,
/**
* g_simple_async_report_gerror_in_idle:
- * @object: (allow-none): a #GObject, or %NULL
+ * @object: (nullable): a #GObject, or %NULL
* @callback: (scope async): a #GAsyncReadyCallback.
* @user_data: (closure): user data passed to @callback.
* @error: the #GError to report
@@ -1078,7 +1078,7 @@ g_simple_async_report_gerror_in_idle (GObject *object,
/**
* g_simple_async_report_take_gerror_in_idle: (skip)
- * @object: (allow-none): a #GObject, or %NULL
+ * @object: (nullable): a #GObject, or %NULL
* @callback: a #GAsyncReadyCallback.
* @user_data: user data passed to @callback.
* @error: the #GError to report
@@ -1113,7 +1113,7 @@ g_simple_async_report_take_gerror_in_idle (GObject *object,
/**
* g_simple_async_result_set_check_cancellable:
* @simple: a #GSimpleAsyncResult
- * @check_cancellable: (allow-none): a #GCancellable to check, or %NULL to unset
+ * @check_cancellable: (nullable): a #GCancellable to check, or %NULL to unset
*
* Sets a #GCancellable to check before dispatching results.
*
diff --git a/gio/gsimpleproxyresolver.c b/gio/gsimpleproxyresolver.c
index ea95280..a4b9abd 100644
--- a/gio/gsimpleproxyresolver.c
+++ b/gio/gsimpleproxyresolver.c
@@ -484,9 +484,9 @@ g_simple_proxy_resolver_iface_init (GProxyResolverInterface *iface)
/**
* g_simple_proxy_resolver_new:
- * @default_proxy: (allow-none): the default proxy to use, eg
+ * @default_proxy: (nullable): the default proxy to use, eg
* "socks://192.168.1.1"
- * @ignore_hosts: (allow-none): an optional list of hosts/IP addresses
+ * @ignore_hosts: (nullable): an optional list of hosts/IP addresses
* to not use a proxy for.
*
* Creates a new #GSimpleProxyResolver. See
diff --git a/gio/gsocket.c b/gio/gsocket.c
index 856fb4f..5a2f332 100644
--- a/gio/gsocket.c
+++ b/gio/gsocket.c
@@ -2295,7 +2295,7 @@ g_socket_multicast_group_operation (GSocket *socket,
* g_socket_join_multicast_group:
* @socket: a #GSocket.
* @group: a #GInetAddress specifying the group address to join.
- * @iface: (allow-none): Name of the interface to use, or %NULL
+ * @iface: (nullable): Name of the interface to use, or %NULL
* @source_specific: %TRUE if source-specific multicast should be used
* @error: #GError for error reporting, or %NULL to ignore.
*
@@ -2329,7 +2329,7 @@ g_socket_join_multicast_group (GSocket *socket,
* g_socket_leave_multicast_group:
* @socket: a #GSocket.
* @group: a #GInetAddress specifying the group address to leave.
- * @iface: (allow-none): Interface used
+ * @iface: (nullable): Interface used
* @source_specific: %TRUE if source-specific multicast was used
* @error: #GError for error reporting, or %NULL to ignore.
*
@@ -2404,7 +2404,7 @@ g_socket_speaks_ipv4 (GSocket *socket)
/**
* g_socket_accept:
* @socket: a #GSocket.
- * @cancellable: (allow-none): a %GCancellable or %NULL
+ * @cancellable: (nullable): a %GCancellable or %NULL
* @error: #GError for error reporting, or %NULL to ignore.
*
* Accept incoming connections on a connection-based socket. This removes
@@ -2517,7 +2517,7 @@ g_socket_accept (GSocket *socket,
* g_socket_connect:
* @socket: a #GSocket.
* @address: a #GSocketAddress specifying the remote address.
- * @cancellable: (allow-none): a %GCancellable or %NULL
+ * @cancellable: (nullable): a %GCancellable or %NULL
* @error: #GError for error reporting, or %NULL to ignore.
*
* Connect the socket to the specified remote address.
@@ -2831,7 +2831,7 @@ g_socket_receive_with_timeout (GSocket *socket,
* @buffer: (array length=size) (element-type guint8): a buffer to
* read data into (which should be at least @size bytes long).
* @size: the number of bytes you want to read from the socket
- * @cancellable: (allow-none): a %GCancellable or %NULL
+ * @cancellable: (nullable): a %GCancellable or %NULL
* @error: #GError for error reporting, or %NULL to ignore.
*
* Receive data (up to @size bytes) from a socket. This is mainly used by
@@ -2882,7 +2882,7 @@ g_socket_receive (GSocket *socket,
* read data into (which should be at least @size bytes long).
* @size: the number of bytes you want to read from the socket
* @blocking: whether to do blocking or non-blocking I/O
- * @cancellable: (allow-none): a %GCancellable or %NULL
+ * @cancellable: (nullable): a %GCancellable or %NULL
* @error: #GError for error reporting, or %NULL to ignore.
*
* This behaves exactly the same as g_socket_receive(), except that
@@ -2909,12 +2909,12 @@ g_socket_receive_with_blocking (GSocket *socket,
/**
* g_socket_receive_from:
* @socket: a #GSocket
- * @address: (out) (allow-none): a pointer to a #GSocketAddress
+ * @address: (out) (optional): a pointer to a #GSocketAddress
* pointer, or %NULL
* @buffer: (array length=size) (element-type guint8): a buffer to
* read data into (which should be at least @size bytes long).
* @size: the number of bytes you want to read from the socket
- * @cancellable: (allow-none): a %GCancellable or %NULL
+ * @cancellable: (nullable): a %GCancellable or %NULL
* @error: #GError for error reporting, or %NULL to ignore.
*
* Receive data (up to @size bytes) from a socket.
@@ -3025,7 +3025,7 @@ g_socket_send_with_timeout (GSocket *socket,
* @buffer: (array length=size) (element-type guint8): the buffer
* containing the data to send.
* @size: the number of bytes to send
- * @cancellable: (allow-none): a %GCancellable or %NULL
+ * @cancellable: (nullable): a %GCancellable or %NULL
* @error: #GError for error reporting, or %NULL to ignore.
*
* Tries to send @size bytes from @buffer on the socket. This is
@@ -3067,7 +3067,7 @@ g_socket_send (GSocket *socket,
* containing the data to send.
* @size: the number of bytes to send
* @blocking: whether to do blocking or non-blocking I/O
- * @cancellable: (allow-none): a %GCancellable or %NULL
+ * @cancellable: (nullable): a %GCancellable or %NULL
* @error: #GError for error reporting, or %NULL to ignore.
*
* This behaves exactly the same as g_socket_send(), except that
@@ -3094,11 +3094,11 @@ g_socket_send_with_blocking (GSocket *socket,
/**
* g_socket_send_to:
* @socket: a #GSocket
- * @address: (allow-none): a #GSocketAddress, or %NULL
+ * @address: (nullable): a #GSocketAddress, or %NULL
* @buffer: (array length=size) (element-type guint8): the buffer
* containing the data to send.
* @size: the number of bytes to send
- * @cancellable: (allow-none): a %GCancellable or %NULL
+ * @cancellable: (nullable): a %GCancellable or %NULL
* @error: #GError for error reporting, or %NULL to ignore.
*
* Tries to send @size bytes from @buffer to @address. If @address is
@@ -3665,7 +3665,7 @@ socket_source_new (GSocket *socket,
* g_socket_create_source: (skip)
* @socket: a #GSocket
* @condition: a #GIOCondition mask to monitor
- * @cancellable: (allow-none): a %GCancellable or %NULL
+ * @cancellable: (nullable): a %GCancellable or %NULL
*
* Creates a #GSource that can be attached to a %GMainContext to monitor
* for the availability of the specified @condition on the socket. The #GSource
@@ -3770,7 +3770,7 @@ g_socket_condition_check (GSocket *socket,
* g_socket_condition_wait:
* @socket: a #GSocket
* @condition: a #GIOCondition mask to wait for
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @error: a #GError pointer, or %NULL
*
* Waits for @condition to become true on @socket. When the condition
@@ -3805,7 +3805,7 @@ g_socket_condition_wait (GSocket *socket,
* @socket: a #GSocket
* @condition: a #GIOCondition mask to wait for
* @timeout: the maximum time (in microseconds) to wait, or -1
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @error: a #GError pointer, or %NULL
*
* Waits for up to @timeout microseconds for @condition to become true
@@ -4184,14 +4184,14 @@ input_message_from_msghdr (const struct msghdr *msg,
/**
* g_socket_send_message:
* @socket: a #GSocket
- * @address: (allow-none): a #GSocketAddress, or %NULL
+ * @address: (nullable): a #GSocketAddress, or %NULL
* @vectors: (array length=num_vectors): an array of #GOutputVector structs
* @num_vectors: the number of elements in @vectors, or -1
- * @messages: (array length=num_messages) (allow-none): a pointer to an
+ * @messages: (array length=num_messages) (nullable): a pointer to an
* array of #GSocketControlMessages, or %NULL.
* @num_messages: number of elements in @messages, or -1.
* @flags: an int containing #GSocketMsgFlags flags
- * @cancellable: (allow-none): a %GCancellable or %NULL
+ * @cancellable: (nullable): a %GCancellable or %NULL
* @error: #GError for error reporting, or %NULL to ignore.
*
* Send data to @address on @socket. For sending multiple messages see
@@ -4455,7 +4455,7 @@ g_socket_send_message_with_timeout (GSocket *socket,
* @messages: (array length=num_messages): an array of #GOutputMessage structs
* @num_messages: the number of elements in @messages
* @flags: an int containing #GSocketMsgFlags flags
- * @cancellable: (allow-none): a %GCancellable or %NULL
+ * @cancellable: (nullable): a %GCancellable or %NULL
* @error: #GError for error reporting, or %NULL to ignore.
*
* Send multiple data messages from @socket in one go. This is the most
@@ -4941,7 +4941,7 @@ g_socket_receive_message_with_timeout (GSocket *socket,
* @messages: (array length=num_messages): an array of #GInputMessage structs
* @num_messages: the number of elements in @messages
* @flags: an int containing #GSocketMsgFlags flags for the overall operation
- * @cancellable: (allow-none): a %GCancellable or %NULL
+ * @cancellable: (nullable): a %GCancellable or %NULL
* @error: #GError for error reporting, or %NULL to ignore
*
* Receive multiple data messages from @socket in one go. This is the most
@@ -5218,11 +5218,11 @@ g_socket_receive_messages_with_timeout (GSocket *socket,
/**
* g_socket_receive_message:
* @socket: a #GSocket
- * @address: (out) (nullable): a pointer to a #GSocketAddress
+ * @address: (out) (optional): a pointer to a #GSocketAddress
* pointer, or %NULL
* @vectors: (array length=num_vectors): an array of #GInputVector structs
* @num_vectors: the number of elements in @vectors, or -1
- * @messages: (array length=num_messages) (out) (nullable): a pointer which
+ * @messages: (array length=num_messages) (out) (optional): a pointer which
* may be filled with an array of #GSocketControlMessages, or %NULL
* @num_messages: (out): a pointer which will be filled with the number of
* elements in @messages, or %NULL
diff --git a/gio/gsocketaddressenumerator.c b/gio/gsocketaddressenumerator.c
index f703f57..2b6935a 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
diff --git a/gio/gsocketclient.c b/gio/gsocketclient.c
index 840051e..94212bf 100644
--- a/gio/gsocketclient.c
+++ b/gio/gsocketclient.c
@@ -489,7 +489,7 @@ g_socket_client_get_local_address (GSocketClient *client)
/**
* g_socket_client_set_local_address:
* @client: a #GSocketClient.
- * @address: (allow-none): a #GSocketAddress, or %NULL
+ * @address: (nullable): a #GSocketAddress, or %NULL
*
* Sets the local address of the socket client.
* The sockets created by this object will bound to the
@@ -720,7 +720,7 @@ g_socket_client_get_proxy_resolver (GSocketClient *client)
/**
* g_socket_client_set_proxy_resolver:
* @client: a #GSocketClient.
- * @proxy_resolver: (allow-none): a #GProxyResolver, or %NULL for the
+ * @proxy_resolver: (nullable): a #GProxyResolver, or %NULL for the
* default.
*
* Overrides the #GProxyResolver used by @client. You can call this if
@@ -939,7 +939,7 @@ g_socket_client_emit_event (GSocketClient *client,
* g_socket_client_connect:
* @client: a #GSocketClient.
* @connectable: a #GSocketConnectable specifying the remote address.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: #GError for error reporting, or %NULL to ignore.
*
* Tries to resolve the @connectable and make a network connection to it.
@@ -1163,7 +1163,7 @@ g_socket_client_connect (GSocketClient *client,
* @client: a #GSocketClient
* @host_and_port: the name and optionally port of the host to connect to
* @default_port: the default port to connect to
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @error: a pointer to a #GError, or %NULL
*
* This is a helper function for g_socket_client_connect().
@@ -1227,7 +1227,7 @@ g_socket_client_connect_to_host (GSocketClient *client,
* @client: a #GSocketConnection
* @domain: a domain name
* @service: the name of the service to connect to
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @error: a pointer to a #GError, or %NULL
*
* Attempts to create a TCP connection to a service.
@@ -1270,7 +1270,7 @@ g_socket_client_connect_to_service (GSocketClient *client,
* @client: a #GSocketClient
* @uri: A network URI
* @default_port: the default port to connect to
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @error: a pointer to a #GError, or %NULL
*
* This is a helper function for g_socket_client_connect().
@@ -1637,7 +1637,7 @@ g_socket_client_enumerator_callback (GObject *object,
* g_socket_client_connect_async:
* @client: a #GSocketClient
* @connectable: a #GSocketConnectable specifying the remote address.
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @callback: (scope async): a #GAsyncReadyCallback
* @user_data: (closure): user data for the callback
*
@@ -1690,7 +1690,7 @@ g_socket_client_connect_async (GSocketClient *client,
* @client: a #GSocketClient
* @host_and_port: the name and optionally the port of the host to connect to
* @default_port: the default port to connect to
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @callback: (scope async): a #GAsyncReadyCallback
* @user_data: (closure): user data for the callback
*
@@ -1736,7 +1736,7 @@ g_socket_client_connect_to_host_async (GSocketClient *client,
* @client: a #GSocketClient
* @domain: a domain name
* @service: the name of the service to connect to
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @callback: (scope async): a #GAsyncReadyCallback
* @user_data: (closure): user data for the callback
*
@@ -1767,7 +1767,7 @@ g_socket_client_connect_to_service_async (GSocketClient *client,
* @client: a #GSocketClient
* @uri: a network uri
* @default_port: the default port to connect to
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @callback: (scope async): a #GAsyncReadyCallback
* @user_data: (closure): user data for the callback
*
diff --git a/gio/gsocketconnection.c b/gio/gsocketconnection.c
index a452bc3..63d974d 100644
--- a/gio/gsocketconnection.c
+++ b/gio/gsocketconnection.c
@@ -139,7 +139,7 @@ g_socket_connection_is_connected (GSocketConnection *connection)
* g_socket_connection_connect:
* @connection: a #GSocketConnection
* @address: a #GSocketAddress specifying the remote address.
- * @cancellable: (allow-none): a %GCancellable or %NULL
+ * @cancellable: (nullable): a %GCancellable or %NULL
* @error: #GError for error reporting, or %NULL to ignore.
*
* Connect @connection to the specified remote address.
@@ -169,7 +169,7 @@ static gboolean g_socket_connection_connect_callback (GSocket *socket,
* g_socket_connection_connect_async:
* @connection: a #GSocketConnection
* @address: a #GSocketAddress specifying the remote address.
- * @cancellable: (allow-none): a %GCancellable or %NULL
+ * @cancellable: (nullable): a %GCancellable or %NULL
* @callback: (scope async): a #GAsyncReadyCallback
* @user_data: (closure): user data for the callback
*
diff --git a/gio/gsocketlistener.c b/gio/gsocketlistener.c
index cd4f78f..fd19668 100644
--- a/gio/gsocketlistener.c
+++ b/gio/gsocketlistener.c
@@ -226,7 +226,7 @@ check_listener (GSocketListener *listener,
* g_socket_listener_add_socket:
* @listener: a #GSocketListener
* @socket: a listening #GSocket
- * @source_object: (allow-none): Optional #GObject identifying this source
+ * @source_object: (nullable): Optional #GObject identifying this source
* @error: #GError for error reporting, or %NULL to ignore.
*
* Adds @socket to the set of sockets that we try to accept
@@ -285,8 +285,8 @@ g_socket_listener_add_socket (GSocketListener *listener,
* @address: a #GSocketAddress
* @type: a #GSocketType
* @protocol: a #GSocketProtocol
- * @source_object: (allow-none): Optional #GObject identifying this source
- * @effective_address: (out) (allow-none): location to store the address that was bound to, or %NULL.
+ * @source_object: (nullable): Optional #GObject identifying this source
+ * @effective_address: (out) (optional): location to store the address that was bound to, or %NULL.
* @error: #GError for error reporting, or %NULL to ignore.
*
* Creates a socket of type @type and protocol @protocol, binds
@@ -392,7 +392,7 @@ g_socket_listener_add_address (GSocketListener *listener,
* g_socket_listener_add_inet_port:
* @listener: a #GSocketListener
* @port: an IP port number (non-zero)
- * @source_object: (allow-none): Optional #GObject identifying this source
+ * @source_object: (nullable): Optional #GObject identifying this source
* @error: #GError for error reporting, or %NULL to ignore.
*
* Helper function for g_socket_listener_add_address() that
@@ -639,8 +639,8 @@ accept_callback (GSocket *socket,
/**
* g_socket_listener_accept_socket:
* @listener: a #GSocketListener
- * @source_object: (out) (transfer none) (allow-none): location where #GObject pointer will be stored, or
%NULL.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @source_object: (out) (transfer none) (optional): location where #GObject pointer will be stored, or
%NULL.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: #GError for error reporting, or %NULL to ignore.
*
* Blocks waiting for a client to connect to any of the sockets added
@@ -716,8 +716,8 @@ g_socket_listener_accept_socket (GSocketListener *listener,
/**
* g_socket_listener_accept:
* @listener: a #GSocketListener
- * @source_object: (out) (transfer none) (allow-none): location where #GObject pointer will be stored, or
%NULL
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @source_object: (out) (transfer none) (optional): location where #GObject pointer will be stored, or %NULL
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @error: #GError for error reporting, or %NULL to ignore.
*
* Blocks waiting for a client to connect to any of the sockets added
@@ -790,7 +790,7 @@ accept_ready (GSocket *accept_socket,
/**
* g_socket_listener_accept_socket_async:
* @listener: a #GSocketListener
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @callback: (scope async): a #GAsyncReadyCallback
* @user_data: (closure): user data for the callback
*
@@ -834,7 +834,7 @@ g_socket_listener_accept_socket_async (GSocketListener *listener,
* g_socket_listener_accept_socket_finish:
* @listener: a #GSocketListener
* @result: a #GAsyncResult.
- * @source_object: (out) (transfer none) (allow-none): Optional #GObject identifying this source
+ * @source_object: (out) (transfer none) (optional): Optional #GObject identifying this source
* @error: a #GError location to store the error occurring, or %NULL to
* ignore.
*
@@ -862,7 +862,7 @@ g_socket_listener_accept_socket_finish (GSocketListener *listener,
/**
* g_socket_listener_accept_async:
* @listener: a #GSocketListener
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @callback: (scope async): a #GAsyncReadyCallback
* @user_data: (closure): user data for the callback
*
@@ -890,7 +890,7 @@ g_socket_listener_accept_async (GSocketListener *listener,
* g_socket_listener_accept_finish:
* @listener: a #GSocketListener
* @result: a #GAsyncResult.
- * @source_object: (out) (transfer none) (allow-none): Optional #GObject identifying this source
+ * @source_object: (out) (transfer none) (optional): Optional #GObject identifying this source
* @error: a #GError location to store the error occurring, or %NULL to
* ignore.
*
@@ -981,7 +981,7 @@ g_socket_listener_close (GSocketListener *listener)
/**
* g_socket_listener_add_any_inet_port:
* @listener: a #GSocketListener
- * @source_object: (allow-none): Optional #GObject identifying this source
+ * @source_object: (nullable): Optional #GObject identifying this source
* @error: a #GError location to store the error occurring, or %NULL to
* ignore.
*
diff --git a/gio/gsocketservice.c b/gio/gsocketservice.c
index b10491b..57113a0 100644
--- a/gio/gsocketservice.c
+++ b/gio/gsocketservice.c
@@ -327,7 +327,7 @@ g_socket_service_class_init (GSocketServiceClass *class)
* GSocketService::incoming:
* @service: the #GSocketService
* @connection: a new #GSocketConnection object
- * @source_object: (allow-none): the source_object passed to
+ * @source_object: (nullable): the source_object passed to
* g_socket_listener_add_address()
*
* The ::incoming signal is emitted when a new incoming connection
diff --git a/gio/gsubprocess.c b/gio/gsubprocess.c
index c791543..5fd5355 100644
--- a/gio/gsubprocess.c
+++ b/gio/gsubprocess.c
@@ -648,7 +648,7 @@ g_subprocess_class_init (GSubprocessClass *class)
/**
* g_subprocess_new: (skip)
* @flags: flags that define the behaviour of the subprocess
- * @error: (allow-none): return location for an error, or %NULL
+ * @error: (nullable): return location for an error, or %NULL
* @argv0: first commandline argument to pass to the subprocess
* @...: more commandline arguments, followed by %NULL
*
@@ -699,7 +699,7 @@ g_subprocess_new (GSubprocessFlags flags,
* g_subprocess_newv: (rename-to g_subprocess_new)
* @argv: (array zero-terminated=1) (element-type utf8): commandline arguments for the subprocess
* @flags: flags that define the behaviour of the subprocess
- * @error: (allow-none): return location for an error, or %NULL
+ * @error: (nullable): return location for an error, or %NULL
*
* Create a new process with the given flags and argument list.
*
@@ -1577,7 +1577,7 @@ g_subprocess_communicate_internal (GSubprocess *subprocess,
/**
* g_subprocess_communicate:
* @subprocess: a #GSubprocess
- * @stdin_buf: (allow-none): data to send to the stdin of the subprocess, or %NULL
+ * @stdin_buf: (nullable): data to send to the stdin of the subprocess, or %NULL
* @cancellable: a #GCancellable
* @stdout_buf: (out): data read from the subprocess stdout
* @stderr_buf: (out): data read from the subprocess stderr
@@ -1658,8 +1658,8 @@ g_subprocess_communicate (GSubprocess *subprocess,
/**
* g_subprocess_communicate_async:
* @subprocess: Self
- * @stdin_buf: (allow-none): Input data, or %NULL
- * @cancellable: (allow-none): Cancellable
+ * @stdin_buf: (nullable): Input data, or %NULL
+ * @cancellable: (nullable): Cancellable
* @callback: Callback
* @user_data: User data
*
@@ -1724,7 +1724,7 @@ g_subprocess_communicate_finish (GSubprocess *subprocess,
/**
* g_subprocess_communicate_utf8:
* @subprocess: a #GSubprocess
- * @stdin_buf: (allow-none): data to send to the stdin of the subprocess, or %NULL
+ * @stdin_buf: (nullable): data to send to the stdin of the subprocess, or %NULL
* @cancellable: a #GCancellable
* @stdout_buf: (out): data read from the subprocess stdout
* @stderr_buf: (out): data read from the subprocess stderr
@@ -1769,7 +1769,7 @@ g_subprocess_communicate_utf8 (GSubprocess *subprocess,
/**
* g_subprocess_communicate_utf8_async:
* @subprocess: Self
- * @stdin_buf: (allow-none): Input data, or %NULL
+ * @stdin_buf: (nullable): Input data, or %NULL
* @cancellable: Cancellable
* @callback: Callback
* @user_data: User data
diff --git a/gio/gtask.c b/gio/gtask.c
index 02ac3e1..5a27674 100644
--- a/gio/gtask.c
+++ b/gio/gtask.c
@@ -654,9 +654,9 @@ g_task_finalize (GObject *object)
/**
* g_task_new:
- * @source_object: (allow-none) (type GObject): the #GObject that owns
+ * @source_object: (nullable) (type GObject): the #GObject that owns
* this task, or %NULL.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
* @callback: (scope async): a #GAsyncReadyCallback.
* @callback_data: (closure): user data passed to @callback.
*
@@ -709,7 +709,7 @@ g_task_new (gpointer source_object,
/**
* g_task_report_error:
- * @source_object: (allow-none) (type GObject): the #GObject that owns
+ * @source_object: (nullable) (type GObject): the #GObject that owns
* this task, or %NULL.
* @callback: (scope async): a #GAsyncReadyCallback.
* @callback_data: (closure): user data passed to @callback.
@@ -744,7 +744,7 @@ g_task_report_error (gpointer source_object,
/**
* g_task_report_new_error:
- * @source_object: (allow-none) (type GObject): the #GObject that owns
+ * @source_object: (nullable) (type GObject): the #GObject that owns
* this task, or %NULL.
* @callback: (scope async): a #GAsyncReadyCallback.
* @callback_data: (closure): user data passed to @callback.
@@ -790,8 +790,8 @@ g_task_report_new_error (gpointer source_object,
/**
* g_task_set_task_data:
* @task: the #GTask
- * @task_data: (allow-none): task-specific data
- * @task_data_destroy: (allow-none): #GDestroyNotify for @task_data
+ * @task_data: (nullable): task-specific data
+ * @task_data_destroy: (nullable): #GDestroyNotify for @task_data
*
* Sets @task's task data (freeing the existing task data, if any).
*
@@ -1562,9 +1562,9 @@ g_task_propagate_error (GTask *task,
/**
* g_task_return_pointer:
* @task: a #GTask
- * @result: (allow-none) (transfer full): the pointer result of a task
+ * @result: (nullable) (transfer full): the pointer result of a task
* function
- * @result_destroy: (allow-none): a #GDestroyNotify function.
+ * @result_destroy: (nullable): a #GDestroyNotify function.
*
* Sets @task's result to @result and completes the task. If @result
* is not %NULL, then @result_destroy will be used to free @result if
@@ -1894,7 +1894,7 @@ g_task_get_completed (GTask *task)
/**
* g_task_is_valid:
* @result: (type Gio.AsyncResult): A #GAsyncResult
- * @source_object: (allow-none) (type GObject): the source object
+ * @source_object: (nullable) (type GObject): the source object
* expected to be associated with the task
*
* Checks that @result is a #GTask, and that @source_object is its
diff --git a/gio/gtestdbus.c b/gio/gtestdbus.c
index 588bcfa..1d17cf4 100644
--- a/gio/gtestdbus.c
+++ b/gio/gtestdbus.c
@@ -715,7 +715,7 @@ g_test_dbus_get_flags (GTestDBus *self)
* been called yet, %NULL is returned. This can be used with
* g_dbus_connection_new_for_address().
*
- * Returns: (allow-none): the address of the bus, or %NULL.
+ * Returns: (nullable): the address of the bus, or %NULL.
*/
const gchar *
g_test_dbus_get_bus_address (GTestDBus *self)
diff --git a/gio/gtlscertificate.c b/gio/gtlscertificate.c
index e75ea2a..b30ed1f 100644
--- a/gio/gtlscertificate.c
+++ b/gio/gtlscertificate.c
@@ -678,8 +678,8 @@ g_tls_certificate_get_issuer (GTlsCertificate *cert)
/**
* g_tls_certificate_verify:
* @cert: a #GTlsCertificate
- * @identity: (allow-none): the expected peer identity
- * @trusted_ca: (allow-none): the certificate of a trusted authority
+ * @identity: (nullable): the expected peer identity
+ * @trusted_ca: (nullable): the certificate of a trusted authority
*
* This verifies @cert and returns a set of #GTlsCertificateFlags
* indicating any problems found with it. This can be used to verify a
diff --git a/gio/gtlsclientconnection.c b/gio/gtlsclientconnection.c
index 99ff9a8..5f56199 100644
--- a/gio/gtlsclientconnection.c
+++ b/gio/gtlsclientconnection.c
@@ -149,7 +149,7 @@ g_tls_client_connection_default_init (GTlsClientConnectionInterface *iface)
/**
* g_tls_client_connection_new:
* @base_io_stream: the #GIOStream to wrap
- * @server_identity: (allow-none): the expected identity of the server
+ * @server_identity: (nullable): the expected identity of the server
* @error: #GError for error reporting, or %NULL to ignore.
*
* Creates a new #GTlsClientConnection wrapping @base_io_stream (which
diff --git a/gio/gtlsconnection.c b/gio/gtlsconnection.c
index c1b644c..11f10d2 100644
--- a/gio/gtlsconnection.c
+++ b/gio/gtlsconnection.c
@@ -501,7 +501,7 @@ g_tls_connection_get_certificate (GTlsConnection *conn)
/**
* g_tls_connection_set_interaction:
* @conn: a connection
- * @interaction: (allow-none): an interaction object, or %NULL
+ * @interaction: (nullable): an interaction object, or %NULL
*
* Set the object that will be used to interact with the user. It will be used
* for things like prompting the user for passwords.
@@ -735,7 +735,7 @@ g_tls_connection_get_rehandshake_mode (GTlsConnection *conn)
/**
* g_tls_connection_handshake:
* @conn: a #GTlsConnection
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @error: a #GError, or %NULL
*
* Attempts a TLS handshake on @conn.
@@ -779,7 +779,7 @@ g_tls_connection_handshake (GTlsConnection *conn,
* g_tls_connection_handshake_async:
* @conn: a #GTlsConnection
* @io_priority: the [I/O priority][io-priority] of the request
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @callback: callback to call when the handshake is complete
* @user_data: the data to pass to the callback function
*
diff --git a/gio/gtlsdatabase.c b/gio/gtlsdatabase.c
index f139891..16d4a37 100644
--- a/gio/gtlsdatabase.c
+++ b/gio/gtlsdatabase.c
@@ -449,11 +449,11 @@ g_tls_database_class_init (GTlsDatabaseClass *klass)
* @self: a #GTlsDatabase
* @chain: a #GTlsCertificate chain
* @purpose: the purpose that this certificate chain will be used for.
- * @identity: (allow-none): the expected peer identity
- * @interaction: (allow-none): used to interact with the user if necessary
+ * @identity: (nullable): the expected peer identity
+ * @interaction: (nullable): used to interact with the user if necessary
* @flags: additional verify flags
- * @cancellable: (allow-none): a #GCancellable, or %NULL
- * @error: (allow-none): a #GError, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
+ * @error: (nullable): a #GError, or %NULL
*
* Verify's a certificate chain after looking up and adding any missing
* certificates to the chain.
@@ -525,10 +525,10 @@ g_tls_database_verify_chain (GTlsDatabase *self,
* @self: a #GTlsDatabase
* @chain: a #GTlsCertificate chain
* @purpose: the purpose that this certificate chain will be used for.
- * @identity: (allow-none): the expected peer identity
- * @interaction: (allow-none): used to interact with the user if necessary
+ * @identity: (nullable): the expected peer identity
+ * @interaction: (nullable): used to interact with the user if necessary
* @flags: additional verify flags
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @callback: callback to call when the operation completes
* @user_data: the data to pass to the callback function
*
@@ -631,10 +631,10 @@ g_tls_database_create_certificate_handle (GTlsDatabase *self,
* g_tls_database_lookup_certificate_for_handle:
* @self: a #GTlsDatabase
* @handle: a certificate handle
- * @interaction: (allow-none): used to interact with the user if necessary
+ * @interaction: (nullable): used to interact with the user if necessary
* @flags: Flags which affect the lookup.
- * @cancellable: (allow-none): a #GCancellable, or %NULL
- * @error: (allow-none): a #GError, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
+ * @error: (nullable): a #GError, or %NULL
*
* Lookup a certificate by its handle.
*
@@ -649,7 +649,7 @@ g_tls_database_create_certificate_handle (GTlsDatabase *self,
* This function can block, use g_tls_database_lookup_certificate_for_handle_async() to perform
* the lookup operation asynchronously.
*
- * Returns: (transfer full) (allow-none): a newly allocated
+ * Returns: (transfer full) (nullable): a newly allocated
* #GTlsCertificate, or %NULL. Use g_object_unref() to release the certificate.
*
* Since: 2.30
@@ -681,9 +681,9 @@ g_tls_database_lookup_certificate_for_handle (GTlsDatabase *self,
* g_tls_database_lookup_certificate_for_handle_async:
* @self: a #GTlsDatabase
* @handle: a certificate handle
- * @interaction: (allow-none): used to interact with the user if necessary
+ * @interaction: (nullable): used to interact with the user if necessary
* @flags: Flags which affect the lookup.
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @callback: callback to call when the operation completes
* @user_data: the data to pass to the callback function
*
@@ -750,10 +750,10 @@ g_tls_database_lookup_certificate_for_handle_finish (GTlsDatabase *se
* g_tls_database_lookup_certificate_issuer:
* @self: a #GTlsDatabase
* @certificate: a #GTlsCertificate
- * @interaction: (allow-none): used to interact with the user if necessary
+ * @interaction: (nullable): used to interact with the user if necessary
* @flags: flags which affect the lookup operation
- * @cancellable: (allow-none): a #GCancellable, or %NULL
- * @error: (allow-none): a #GError, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
+ * @error: (nullable): a #GError, or %NULL
*
* Lookup the issuer of @certificate in the database.
*
@@ -795,9 +795,9 @@ g_tls_database_lookup_certificate_issuer (GTlsDatabase *self,
* g_tls_database_lookup_certificate_issuer_async:
* @self: a #GTlsDatabase
* @certificate: a #GTlsCertificate
- * @interaction: (allow-none): used to interact with the user if necessary
+ * @interaction: (nullable): used to interact with the user if necessary
* @flags: flags which affect the lookup operation
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @callback: callback to call when the operation completes
* @user_data: the data to pass to the callback function
*
@@ -862,10 +862,10 @@ g_tls_database_lookup_certificate_issuer_finish (GTlsDatabase *self,
* g_tls_database_lookup_certificates_issued_by:
* @self: a #GTlsDatabase
* @issuer_raw_dn: a #GByteArray which holds the DER encoded issuer DN.
- * @interaction: (allow-none): used to interact with the user if necessary
+ * @interaction: (nullable): used to interact with the user if necessary
* @flags: Flags which affect the lookup operation.
- * @cancellable: (allow-none): a #GCancellable, or %NULL
- * @error: (allow-none): a #GError, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
+ * @error: (nullable): a #GError, or %NULL
*
* Lookup certificates issued by this issuer in the database.
*
@@ -903,9 +903,9 @@ g_tls_database_lookup_certificates_issued_by (GTlsDatabase *self,
* g_tls_database_lookup_certificates_issued_by_async:
* @self: a #GTlsDatabase
* @issuer_raw_dn: a #GByteArray which holds the DER encoded issuer DN.
- * @interaction: (allow-none): used to interact with the user if necessary
+ * @interaction: (nullable): used to interact with the user if necessary
* @flags: Flags which affect the lookup operation.
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @callback: callback to call when the operation completes
* @user_data: the data to pass to the callback function
*
diff --git a/gio/gtlsinteraction.c b/gio/gtlsinteraction.c
index 2538237..75134a2 100644
--- a/gio/gtlsinteraction.c
+++ b/gio/gtlsinteraction.c
@@ -457,8 +457,8 @@ g_tls_interaction_ask_password (GTlsInteraction *interaction,
* @interaction: a #GTlsInteraction object
* @password: a #GTlsPassword object
* @cancellable: an optional #GCancellable cancellation object
- * @callback: (allow-none): will be called when the interaction completes
- * @user_data: (allow-none): data to pass to the @callback
+ * @callback: (nullable): will be called when the interaction completes
+ * @user_data: (nullable): data to pass to the @callback
*
* Run asynchronous interaction to ask the user for a password. In general,
* g_tls_interaction_invoke_ask_password() should be used instead of this
@@ -754,8 +754,8 @@ g_tls_interaction_request_certificate (GTlsInteraction *interaction
* @connection: a #GTlsConnection object
* @flags: flags providing more information about the request
* @cancellable: an optional #GCancellable cancellation object
- * @callback: (allow-none): will be called when the interaction completes
- * @user_data: (allow-none): data to pass to the @callback
+ * @callback: (nullable): will be called when the interaction completes
+ * @user_data: (nullable): data to pass to the @callback
*
* Run asynchronous interaction to ask the user for a certificate to use with
* the connection. In general, g_tls_interaction_invoke_request_certificate() should
diff --git a/gio/gtlspassword.c b/gio/gtlspassword.c
index 57e60ac..a64faa4 100644
--- a/gio/gtlspassword.c
+++ b/gio/gtlspassword.c
@@ -241,7 +241,7 @@ g_tls_password_new (GTlsPasswordFlags flags,
/**
* g_tls_password_get_value:
* @password: a #GTlsPassword object
- * @length: (allow-none): location to place the length of the password.
+ * @length: (nullable): location to place the length of the password.
*
* Get the password value. If @length is not %NULL then it will be
* filled in with the length of the password value. (Note that the
@@ -295,7 +295,7 @@ g_tls_password_set_value (GTlsPassword *password,
* @password: a #GTlsPassword object
* @value: the value for the password
* @length: the length of the password, or -1
- * @destroy: (allow-none): a function to use to free the password.
+ * @destroy: (nullable): a function to use to free the password.
*
* Provide the value for this password.
*
diff --git a/gio/gtlsserverconnection.c b/gio/gtlsserverconnection.c
index 518af55..d1e488b 100644
--- a/gio/gtlsserverconnection.c
+++ b/gio/gtlsserverconnection.c
@@ -65,7 +65,7 @@ g_tls_server_connection_default_init (GTlsServerConnectionInterface *iface)
/**
* g_tls_server_connection_new:
* @base_io_stream: the #GIOStream to wrap
- * @certificate: (allow-none): the default server certificate, or %NULL
+ * @certificate: (nullable): the default server certificate, or %NULL
* @error: #GError for error reporting, or %NULL to ignore.
*
* Creates a new #GTlsServerConnection wrapping @base_io_stream (which
diff --git a/gio/gunixconnection.c b/gio/gunixconnection.c
index f87be31..16245f1 100644
--- a/gio/gunixconnection.c
+++ b/gio/gunixconnection.c
@@ -65,8 +65,8 @@ G_DEFINE_TYPE_WITH_CODE (GUnixConnection, g_unix_connection,
* g_unix_connection_send_fd:
* @connection: a #GUnixConnection
* @fd: a file descriptor
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @error: (allow-none): #GError for error reporting, or %NULL to ignore.
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore.
+ * @error: (nullable): #GError for error reporting, or %NULL to ignore.
*
* Passes a file descriptor to the receiving side of the
* connection. The receiving end has to call g_unix_connection_receive_fd()
@@ -119,8 +119,8 @@ g_unix_connection_send_fd (GUnixConnection *connection,
/**
* g_unix_connection_receive_fd:
* @connection: a #GUnixConnection
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore
- * @error: (allow-none): #GError for error reporting, or %NULL to ignore
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore
+ * @error: (nullable): #GError for error reporting, or %NULL to ignore
*
* Receives a file descriptor from the sending end of the connection.
* The sending end has to call g_unix_connection_send_fd() for this
@@ -288,7 +288,7 @@ gboolean g_unix_connection_create_pair (GUnixCo
/**
* g_unix_connection_send_credentials:
* @connection: A #GUnixConnection.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
* @error: Return location for error or %NULL.
*
* Passes the credentials of the current user the receiving side
@@ -386,7 +386,7 @@ send_credentials_async_thread (GTask *task,
/**
* g_unix_connection_send_credentials_async:
* @connection: A #GUnixConnection.
- * @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
*
@@ -439,7 +439,7 @@ g_unix_connection_send_credentials_finish (GUnixConnection *connection,
/**
* g_unix_connection_receive_credentials:
* @connection: A #GUnixConnection.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @cancellable: (nullable): A #GCancellable or %NULL.
* @error: Return location for error or %NULL.
*
* Receives credentials from the sending end of the connection. The
@@ -647,7 +647,7 @@ receive_credentials_async_thread (GTask *task,
/**
* g_unix_connection_receive_credentials_async:
* @connection: A #GUnixConnection.
- * @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
*
diff --git a/gio/gunixfdlist.c b/gio/gunixfdlist.c
index de4e772..7c3fc6a 100644
--- a/gio/gunixfdlist.c
+++ b/gio/gunixfdlist.c
@@ -200,7 +200,7 @@ g_unix_fd_list_new_from_array (const gint *fds,
/**
* g_unix_fd_list_steal_fds:
* @list: a #GUnixFDList
- * @length: (out) (allow-none): pointer to the length of the returned
+ * @length: (out) (optional): pointer to the length of the returned
* array, or %NULL
*
* Returns the array of file descriptors that is contained in this
@@ -256,7 +256,7 @@ g_unix_fd_list_steal_fds (GUnixFDList *list,
/**
* g_unix_fd_list_peek_fds:
* @list: a #GUnixFDList
- * @length: (out) (allow-none): pointer to the length of the returned
+ * @length: (out) (optional): pointer to the length of the returned
* array, or %NULL
*
* Returns the array of file descriptors that is contained in this
diff --git a/gio/gunixfdmessage.c b/gio/gunixfdmessage.c
index 523d729..f3b303c 100644
--- a/gio/gunixfdmessage.c
+++ b/gio/gunixfdmessage.c
@@ -261,7 +261,7 @@ g_unix_fd_message_new_with_fd_list (GUnixFDList *fd_list)
/**
* g_unix_fd_message_steal_fds:
* @message: a #GUnixFDMessage
- * @length: (out) (allow-none): pointer to the length of the returned
+ * @length: (out) (optional): pointer to the length of the returned
* array, or %NULL
*
* Returns the array of file descriptors that is contained in this
diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c
index d08a4e2..0c73a56 100644
--- a/gio/gunixmounts.c
+++ b/gio/gunixmounts.c
@@ -1390,7 +1390,7 @@ get_mount_points_timestamp (void)
/**
* g_unix_mounts_get: (skip)
- * @time_read: (out) (allow-none): guint64 to contain a timestamp, or %NULL
+ * @time_read: (out) (optional): guint64 to contain a timestamp, or %NULL
*
* Gets a #GList of #GUnixMountEntry containing the unix mounts.
* If @time_read is set, it will be filled with the mount
@@ -1412,7 +1412,7 @@ g_unix_mounts_get (guint64 *time_read)
/**
* g_unix_mount_at: (skip)
* @mount_path: path for a possible unix mount.
- * @time_read: (out) (allow-none): guint64 to contain a timestamp.
+ * @time_read: (out) (optional): guint64 to contain a timestamp.
*
* Gets a #GUnixMountEntry for a given mount path. If @time_read
* is set, it will be filled with a unix timestamp for checking
@@ -1447,7 +1447,7 @@ g_unix_mount_at (const char *mount_path,
/**
* g_unix_mount_for: (skip)
* @file_path: file path on some unix mount.
- * @time_read: (out) (allow-none): guint64 to contain a timestamp.
+ * @time_read: (out) (optional): guint64 to contain a timestamp.
*
* Gets a #GUnixMountEntry for a given file path. If @time_read
* is set, it will be filled with a unix timestamp for checking
@@ -1483,7 +1483,7 @@ g_unix_mount_for (const char *file_path,
/**
* g_unix_mount_points_get: (skip)
- * @time_read: (out) (allow-none): guint64 to contain a timestamp.
+ * @time_read: (out) (optional): guint64 to contain a timestamp.
*
* Gets a #GList of #GUnixMountPoint containing the unix mount points.
* If @time_read is set, it will be filled with the mount timestamp,
diff --git a/gio/gvolume.c b/gio/gvolume.c
index 5626baa..3f08ebc 100644
--- a/gio/gvolume.c
+++ b/gio/gvolume.c
@@ -330,9 +330,9 @@ g_volume_should_automount (GVolume *volume)
* g_volume_mount:
* @volume: a #GVolume
* @flags: flags affecting the operation
- * @mount_operation: (allow-none): a #GMountOperation or %NULL to avoid user interaction
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore
- * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL
+ * @mount_operation: (nullable): a #GMountOperation or %NULL to avoid user interaction
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore
+ * @callback: (nullable): a #GAsyncReadyCallback, or %NULL
* @user_data: user data that gets passed to @callback
*
* Mounts a volume. This is an asynchronous operation, and is
@@ -406,8 +406,8 @@ g_volume_mount_finish (GVolume *volume,
* g_volume_eject:
* @volume: a #GVolume
* @flags: flags affecting the unmount if required for eject
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore
- * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore
+ * @callback: (nullable): a #GAsyncReadyCallback, or %NULL
* @user_data: user data that gets passed to @callback
*
* Ejects a volume. This is an asynchronous operation, and is
@@ -477,10 +477,10 @@ g_volume_eject_finish (GVolume *volume,
* g_volume_eject_with_operation:
* @volume: a #GVolume
* @flags: flags affecting the unmount if required for eject
- * @mount_operation: (allow-none): a #GMountOperation or %NULL to
+ * @mount_operation: (nullable): a #GMountOperation or %NULL to
* avoid user interaction
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore
- * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL
+ * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore
+ * @callback: (nullable): a #GAsyncReadyCallback, or %NULL
* @user_data: user data passed to @callback
*
* Ejects a volume. This is an asynchronous operation, and is
diff --git a/gio/gwin32registrykey.c b/gio/gwin32registrykey.c
index 69cd9ed..313980b 100644
--- a/gio/gwin32registrykey.c
+++ b/gio/gwin32registrykey.c
@@ -484,7 +484,7 @@ g_win32_registry_key_new (const gchar *path,
/**
* g_win32_registry_key_new_w:
* @path: (in) (transfer none): absolute full name of a key to open (in UTF-16)
- * @error: (inout) (nullable): a pointer to a %NULL #GError, or %NULL
+ * @error: (inout) (optional): a pointer to a %NULL #GError, or %NULL
*
* Creates an object that represents a registry key specified by @path.
* @path must start with one of the following pre-defined names:
@@ -628,7 +628,7 @@ g_win32_registry_key_initable_init (GInitable *initable,
* g_win32_registry_key_get_child:
* @key: (in) (transfer none): a parent #GWin32RegistryKey
* @subkey: (in) (transfer none): name of a child key to open (in UTF-8), relative to @key
- * @error: (inout) (nullable): a pointer to a %NULL #GError, or %NULL
+ * @error: (inout) (optional): a pointer to a %NULL #GError, or %NULL
*
* Opens a @subkey of the @key.
*
@@ -662,7 +662,7 @@ g_win32_registry_key_get_child (GWin32RegistryKey *key,
* g_win32_registry_key_get_child_w:
* @key: (in) (transfer none): a parent #GWin32RegistryKey
* @subkey: (in) (transfer none): name of a child key to open (in UTF-8), relative to @key
- * @error: (inout) (nullable): a pointer to a %NULL #GError, or %NULL
+ * @error: (inout) (optional): a pointer to a %NULL #GError, or %NULL
*
* Opens a @subkey of the @key.
*
@@ -739,7 +739,7 @@ g_win32_registry_key_get_child_w (GWin32RegistryKey *key,
* g_win32_registry_subkey_iter_init:
* @iter: (in) (transfer none): a pointer to a #GWin32RegistrySubkeyIter
* @key: (in) (transfer none): a #GWin32RegistryKey to iterate over
- * @error: (inout) (nullable): a pointer to %NULL #GError, or %NULL
+ * @error: (inout) (optional): a pointer to %NULL #GError, or %NULL
*
* Initialises (without allocating) a #GWin32RegistrySubkeyIter. @iter may be
* completely uninitialised prior to this call; its old value is
diff --git a/gio/gzlibcompressor.c b/gio/gzlibcompressor.c
index 68445d0..5e89017 100644
--- a/gio/gzlibcompressor.c
+++ b/gio/gzlibcompressor.c
@@ -311,7 +311,7 @@ g_zlib_compressor_get_file_info (GZlibCompressor *compressor)
/**
* g_zlib_compressor_set_file_info:
* @compressor: a #GZlibCompressor
- * @file_info: (allow-none): a #GFileInfo
+ * @file_info: (nullable): a #GFileInfo
*
* Sets @file_info in @compressor. If non-%NULL, and @compressor's
* #GZlibCompressor:format property is %G_ZLIB_COMPRESSOR_FORMAT_GZIP,
diff --git a/gio/tests/file.c b/gio/tests/file.c
index 04eaea9..7791837 100644
--- a/gio/tests/file.c
+++ b/gio/tests/file.c
@@ -498,7 +498,7 @@ static const gchar *replace_data =
" * @file: input #GFile.\n"
" * @contents: string of contents to replace the file with.\n"
" * @length: the length of @contents in bytes.\n"
- " * @etag: (allow-none): a new <link linkend=\"gfile-etag\">entity tag</link> for the @file, or %NULL\n"
+ " * @etag: (nullable): a new <link linkend=\"gfile-etag\">entity tag</link> for the @file, or %NULL\n"
" * @make_backup: %TRUE if a backup should be created.\n"
" * @flags: a set of #GFileCreateFlags.\n"
" * @cancellable: optional #GCancellable object, %NULL to ignore.\n"
diff --git a/gio/tests/test-pipe-unix.c b/gio/tests/test-pipe-unix.c
index 3d75964..b9fb38c 100644
--- a/gio/tests/test-pipe-unix.c
+++ b/gio/tests/test-pipe-unix.c
@@ -36,8 +36,8 @@
/**
* test_pipe:
- * @is: (out) (allow-none): used to return a #GInputStream
- * @os: (out) (allow-none): used to return a #GOutputStream
+ * @is: (out) (optional): used to return a #GInputStream
+ * @os: (out) (optional): used to return a #GOutputStream
* @error: used to raise an error
*
* Return a "pipe to self" connecting @is to @os. This can be used
@@ -82,8 +82,8 @@ test_pipe (GInputStream **is,
/**
* test_bidi_pipe:
- * @left: (out) (allow-none): used to return one #GIOStream
- * @right: (out) (allow-none): used to return the other #GIOStream
+ * @left: (out) (optional): used to return one #GIOStream
+ * @right: (out) (optional): used to return the other #GIOStream
* @error: used to raise an error
*
* Return two #GIOStream<!---->s connected to each other with pipes.
diff --git a/glib/garray.c b/glib/garray.c
index 727c102..0b4bf04 100644
--- a/glib/garray.c
+++ b/glib/garray.c
@@ -913,7 +913,7 @@ g_ptr_array_sized_new (guint reserved_size)
/**
* g_ptr_array_new_with_free_func:
- * @element_free_func: (allow-none): A function to free elements with
+ * @element_free_func: (nullable): A function to free elements with
* destroy @array or %NULL
*
* Creates a new #GPtrArray with a reference count of 1 and use
@@ -939,7 +939,7 @@ g_ptr_array_new_with_free_func (GDestroyNotify element_free_func)
/**
* g_ptr_array_new_full:
* @reserved_size: number of pointers preallocated
- * @element_free_func: (allow-none): A function to free elements with
+ * @element_free_func: (nullable): A function to free elements with
* destroy @array or %NULL
*
* Creates a new #GPtrArray with @reserved_size pointers preallocated
@@ -969,7 +969,7 @@ g_ptr_array_new_full (guint reserved_size,
/**
* g_ptr_array_set_free_func:
* @array: A #GPtrArray
- * @element_free_func: (allow-none): A function to free elements with
+ * @element_free_func: (nullable): A function to free elements with
* destroy @array or %NULL
*
* Sets a function for freeing each element when @array is destroyed
diff --git a/glib/gbookmarkfile.c b/glib/gbookmarkfile.c
index a1cd9b3..0ae89c3 100644
--- a/glib/gbookmarkfile.c
+++ b/glib/gbookmarkfile.c
@@ -1767,7 +1767,7 @@ find_file_in_data_dirs (const gchar *file,
* g_bookmark_file_load_from_data_dirs:
* @bookmark: a #GBookmarkFile
* @file: (type filename): a relative path to a filename to open and parse
- * @full_path: (type filename) (allow-none): return location for a string
+ * @full_path: (type filename) (nullable): return location for a string
* containing the full path of the file, or %NULL
* @error: return location for a #GError, or %NULL
*
@@ -1848,7 +1848,7 @@ g_bookmark_file_load_from_data_dirs (GBookmarkFile *bookmark,
/**
* g_bookmark_file_to_data:
* @bookmark: a #GBookmarkFile
- * @length: (allow-none) (out): return location for the length of the returned string, or %NULL
+ * @length: (out) (optional): return location for the length of the returned string, or %NULL
* @error: return location for a #GError, or %NULL
*
* This function outputs @bookmark as a string.
@@ -2038,7 +2038,7 @@ g_bookmark_file_has_item (GBookmarkFile *bookmark,
/**
* g_bookmark_file_get_uris:
* @bookmark: a #GBookmarkFile
- * @length: (allow-none) (out): return location for the number of returned URIs, or %NULL
+ * @length: (out) (optional): return location for the number of returned URIs, or %NULL
*
* Returns all URIs of the bookmarks in the bookmark file @bookmark.
* The array of returned URIs will be %NULL-terminated, so @length may
@@ -2082,7 +2082,7 @@ g_bookmark_file_get_uris (GBookmarkFile *bookmark,
/**
* g_bookmark_file_set_title:
* @bookmark: a #GBookmarkFile
- * @uri: (allow-none): a valid URI or %NULL
+ * @uri: (nullable): a valid URI or %NULL
* @title: a UTF-8 encoded string
*
* Sets @title as the title of the bookmark for @uri inside the
@@ -2127,7 +2127,7 @@ g_bookmark_file_set_title (GBookmarkFile *bookmark,
/**
* g_bookmark_file_get_title:
* @bookmark: a #GBookmarkFile
- * @uri: (allow-none): a valid URI or %NULL
+ * @uri: (nullable): a valid URI or %NULL
* @error: return location for a #GError, or %NULL
*
* Returns the title of the bookmark for @uri.
@@ -2170,7 +2170,7 @@ g_bookmark_file_get_title (GBookmarkFile *bookmark,
/**
* g_bookmark_file_set_description:
* @bookmark: a #GBookmarkFile
- * @uri: (allow-none): a valid URI or %NULL
+ * @uri: (nullable): a valid URI or %NULL
* @description: a string
*
* Sets @description as the description of the bookmark for @uri.
@@ -2823,7 +2823,7 @@ g_bookmark_file_remove_group (GBookmarkFile *bookmark,
* g_bookmark_file_set_groups:
* @bookmark: a #GBookmarkFile
* @uri: an item's URI
- * @groups: (allow-none): an array of group names, or %NULL to remove all groups
+ * @groups: (nullable): an array of group names, or %NULL to remove all groups
* @length: number of group name values in @groups
*
* Sets a list of group names for the item with URI @uri. Each previously
@@ -2873,7 +2873,7 @@ g_bookmark_file_set_groups (GBookmarkFile *bookmark,
* g_bookmark_file_get_groups:
* @bookmark: a #GBookmarkFile
* @uri: a valid URI
- * @length: (allow-none) (out): return location for the length of the returned string, or %NULL
+ * @length: (out) (optional): return location for the length of the returned string, or %NULL
* @error: return location for a #GError, or %NULL
*
* Retrieves the list of group names of the bookmark for @uri.
@@ -2945,9 +2945,9 @@ g_bookmark_file_get_groups (GBookmarkFile *bookmark,
* g_bookmark_file_add_application:
* @bookmark: a #GBookmarkFile
* @uri: a valid URI
- * @name: (allow-none): the name of the application registering the bookmark
+ * @name: (nullable): the name of the application registering the bookmark
* or %NULL
- * @exec: (allow-none): command line to be used to launch the bookmark or %NULL
+ * @exec: (nullable): command line to be used to launch the bookmark or %NULL
*
* Adds the application with @name and @exec to the list of
* applications that have registered a bookmark for @uri into
@@ -3298,9 +3298,9 @@ expand_exec_line (const gchar *exec_fmt,
* @bookmark: a #GBookmarkFile
* @uri: a valid URI
* @name: an application's name
- * @exec: (allow-none) (out): return location for the command line of the application, or %NULL
- * @count: (allow-none) (out): return location for the registration count, or %NULL
- * @stamp: (allow-none) (out): return location for the last registration time, or %NULL
+ * @exec: (out) (optional): return location for the command line of the application, or %NULL
+ * @count: (out) (optional): return location for the registration count, or %NULL
+ * @stamp: (out) (optional): return location for the last registration time, or %NULL
* @error: return location for a #GError, or %NULL
*
* Gets the registration informations of @app_name for the bookmark for
@@ -3398,7 +3398,7 @@ g_bookmark_file_get_app_info (GBookmarkFile *bookmark,
* g_bookmark_file_get_applications:
* @bookmark: a #GBookmarkFile
* @uri: a valid URI
- * @length: (allow-none) (out): return location of the length of the returned list, or %NULL
+ * @length: (out) (optional): return location of the length of the returned list, or %NULL
* @error: return location for a #GError, or %NULL
*
* Retrieves the names of the applications that have registered the
@@ -3490,7 +3490,7 @@ g_bookmark_file_get_size (GBookmarkFile *bookmark)
* g_bookmark_file_move_item:
* @bookmark: a #GBookmarkFile
* @old_uri: a valid URI
- * @new_uri: (allow-none): a valid URI, or %NULL
+ * @new_uri: (nullable): a valid URI, or %NULL
* @error: return location for a #GError or %NULL
*
* Changes the URI of a bookmark item from @old_uri to @new_uri. Any
@@ -3556,7 +3556,7 @@ g_bookmark_file_move_item (GBookmarkFile *bookmark,
* g_bookmark_file_set_icon:
* @bookmark: a #GBookmarkFile
* @uri: a valid URI
- * @href: (allow-none): the URI of the icon for the bookmark, or %NULL
+ * @href: (nullable): the URI of the icon for the bookmark, or %NULL
* @mime_type: the MIME type of the icon for the bookmark
*
* Sets the icon for the bookmark for @uri. If @href is %NULL, unsets
@@ -3605,8 +3605,8 @@ g_bookmark_file_set_icon (GBookmarkFile *bookmark,
* g_bookmark_file_get_icon:
* @bookmark: a #GBookmarkFile
* @uri: a valid URI
- * @href: (allow-none) (out): return location for the icon's location or %NULL
- * @mime_type: (allow-none) (out): return location for the icon's MIME type or %NULL
+ * @href: (out) (optional): return location for the icon's location or %NULL
+ * @mime_type: (out) (optional): return location for the icon's MIME type or %NULL
* @error: return location for a #GError or %NULL
*
* Gets the icon of the bookmark for @uri.
diff --git a/glib/gconvert.c b/glib/gconvert.c
index 1de941e..1e27f92 100644
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -1530,8 +1530,7 @@ hostname_validate (const char *hostname)
/**
* g_filename_from_uri:
* @uri: a uri describing a filename (escaped, encoded in ASCII).
- * @hostname: (out) (optional) (nullable): Location to store hostname for the
- * URI.
+ * @hostname: (out) (optional): Location to store hostname for the URI.
* If there is no hostname in the URI, %NULL will be
* stored in this location.
* @error: location to store the error occurring, or %NULL to ignore
@@ -1692,7 +1691,7 @@ g_filename_from_uri (const gchar *uri,
* @filename: (type filename): an absolute filename specified in the GLib file
* name encoding, which is the on-disk file name bytes on Unix, and UTF-8
* on Windows
- * @hostname: (allow-none): A UTF-8 encoded hostname, or %NULL for none.
+ * @hostname: (nullable): A UTF-8 encoded hostname, or %NULL for none.
* @error: location to store the error occurring, or %NULL to ignore
* errors. Any of the errors in #GConvertError may occur.
*
diff --git a/glib/gdataset.c b/glib/gdataset.c
index 4f00d99..df75c81 100644
--- a/glib/gdataset.c
+++ b/glib/gdataset.c
@@ -588,7 +588,7 @@ g_dataset_id_set_data_full (gconstpointer dataset_location,
* g_datalist_id_set_data_full:
* @datalist: a datalist.
* @key_id: the #GQuark to identify the data element.
- * @data: (allow-none): the data element or %NULL to remove any previous element
+ * @data: (nullable): the data element or %NULL to remove any previous element
* corresponding to @key_id.
* @destroy_func: the function to call when the data element is
* removed. This function will be called with the data
@@ -605,7 +605,7 @@ g_dataset_id_set_data_full (gconstpointer dataset_location,
* g_datalist_set_data_full:
* @dl: a datalist.
* @k: the string to identify the data element.
- * @d: (allow-none): the data element, or %NULL to remove any previous element
+ * @d: (nullable): the data element, or %NULL to remove any previous element
* corresponding to @k.
* @f: the function to call when the data element is removed. This
* function will be called with the data element and can be used to
@@ -619,7 +619,7 @@ g_dataset_id_set_data_full (gconstpointer dataset_location,
* g_datalist_id_set_data:
* @dl: a datalist.
* @q: the #GQuark to identify the data element.
- * @d: (allow-none): the data element, or %NULL to remove any previous element
+ * @d: (nullable): the data element, or %NULL to remove any previous element
* corresponding to @q.
*
* Sets the data corresponding to the given #GQuark id. Any previous
@@ -630,7 +630,7 @@ g_dataset_id_set_data_full (gconstpointer dataset_location,
* g_datalist_set_data:
* @dl: a datalist.
* @k: the string to identify the data element.
- * @d: (allow-none): the data element, or %NULL to remove any previous element
+ * @d: (nullable): the data element, or %NULL to remove any previous element
* corresponding to @k.
*
* Sets the data element corresponding to the given string identifier.
@@ -815,8 +815,8 @@ g_datalist_id_get_data (GData **datalist,
* g_datalist_id_dup_data:
* @datalist: location of a datalist
* @key_id: the #GQuark identifying a data element
- * @dup_func: (allow-none): function to duplicate the old value
- * @user_data: (allow-none): passed as user_data to @dup_func
+ * @dup_func: (nullable): function to duplicate the old value
+ * @user_data: (nullable): passed as user_data to @dup_func
*
* This is a variant of g_datalist_id_get_data() which
* returns a 'duplicate' of the value. @dup_func defines the
@@ -882,10 +882,10 @@ g_datalist_id_dup_data (GData **datalist,
* g_datalist_id_replace_data:
* @datalist: location of a datalist
* @key_id: the #GQuark identifying a data element
- * @oldval: (allow-none): the old value to compare against
- * @newval: (allow-none): the new value to replace it with
- * @destroy: (allow-none): destroy notify for the new value
- * @old_destroy: (allow-none): destroy notify for the existing value
+ * @oldval: (nullable): the old value to compare against
+ * @newval: (nullable): the new value to replace it with
+ * @destroy: (nullable): destroy notify for the new value
+ * @old_destroy: (nullable): destroy notify for the existing value
*
* Compares the member that is associated with @key_id in
* @datalist to @oldval, and if they are the same, replace
diff --git a/glib/gdatetime.c b/glib/gdatetime.c
index 8ff0223..36e541b 100644
--- a/glib/gdatetime.c
+++ b/glib/gdatetime.c
@@ -1458,9 +1458,9 @@ g_date_time_equal (gconstpointer dt1,
/**
* g_date_time_get_ymd:
* @datetime: a #GDateTime.
- * @year: (out) (allow-none): the return location for the gregorian year, or %NULL.
- * @month: (out) (allow-none): the return location for the month of the year, or %NULL.
- * @day: (out) (allow-none): the return location for the day of the month, or %NULL.
+ * @year: (out) (optional): the return location for the gregorian year, or %NULL.
+ * @month: (out) (optional): the return location for the month of the year, or %NULL.
+ * @day: (out) (optional): the return location for the day of the month, or %NULL.
*
* Retrieves the Gregorian day, month, and year of a given #GDateTime.
*
diff --git a/glib/genviron.c b/glib/genviron.c
index 8c64cda..0dfcb5c 100644
--- a/glib/genviron.c
+++ b/glib/genviron.c
@@ -67,7 +67,7 @@ g_environ_find (gchar **envp,
/**
* g_environ_getenv:
- * @envp: (allow-none) (array zero-terminated=1) (transfer none): an environment
+ * @envp: (nullable) (array zero-terminated=1) (transfer none): an environment
* list (eg, as returned from g_get_environ()), or %NULL
* for an empty environment list
* @variable: the environment variable to get
@@ -99,7 +99,7 @@ g_environ_getenv (gchar **envp,
/**
* g_environ_setenv:
- * @envp: (allow-none) (array zero-terminated=1) (transfer full): an
+ * @envp: (nullable) (array zero-terminated=1) (transfer full): an
* environment list that can be freed using g_strfreev() (e.g., as
* returned from g_get_environ()), or %NULL for an empty
* environment list
@@ -186,7 +186,7 @@ g_environ_unsetenv_internal (gchar **envp,
/**
* g_environ_unsetenv:
- * @envp: (allow-none) (array zero-terminated=1) (transfer full): an environment
+ * @envp: (nullable) (array zero-terminated=1) (transfer full): an environment
* list that can be freed using g_strfreev() (e.g., as returned from g_get_environ()),
* or %NULL for an empty environment list
* @variable: the environment variable to remove, must not contain '='
diff --git a/glib/gerror.c b/glib/gerror.c
index 380382b..625e67b 100644
--- a/glib/gerror.c
+++ b/glib/gerror.c
@@ -694,7 +694,7 @@ g_error_add_prefix (gchar **string,
/**
* g_prefix_error:
- * @err: (inout) (optional) (nullable): a return location for a #GError
+ * @err: (inout) (optional): a return location for a #GError
* @format: printf()-style format string
* @...: arguments to @format
*
diff --git a/glib/gfileutils.c b/glib/gfileutils.c
index 99cc72b..b36d984 100644
--- a/glib/gfileutils.c
+++ b/glib/gfileutils.c
@@ -953,7 +953,7 @@ get_contents_win32 (const gchar *filename,
* @filename: (type filename): name of a file to read contents from, in the GLib file name encoding
* @contents: (out) (array length=length) (element-type guint8): location to store an allocated string, use
g_free() to free
* the returned string
- * @length: (allow-none): location to store length in bytes of the contents, or %NULL
+ * @length: (nullable): location to store length in bytes of the contents, or %NULL
* @error: return location for a #GError, or %NULL
*
* Reads an entire file into allocated memory, with good error
@@ -1551,7 +1551,7 @@ g_get_tmp_name (const gchar *tmpl,
/**
* g_file_open_tmp:
- * @tmpl: (type filename) (allow-none): Template for file name, as in
+ * @tmpl: (type filename) (nullable): Template for file name, as in
* g_mkstemp(), basename only, or %NULL for a default template
* @name_used: (out) (type filename): location to store actual name used,
* or %NULL
@@ -1605,7 +1605,7 @@ g_file_open_tmp (const gchar *tmpl,
/**
* g_dir_make_tmp:
- * @tmpl: (type filename) (allow-none): Template for directory name,
+ * @tmpl: (type filename) (nullable): Template for directory name,
* as in g_mkdtemp(), basename only, or %NULL for a default template
* @error: return location for a #GError
*
diff --git a/glib/ggettext.c b/glib/ggettext.c
index bf74ccb..19f5f41 100644
--- a/glib/ggettext.c
+++ b/glib/ggettext.c
@@ -184,7 +184,7 @@ g_strip_context (const gchar *msgid,
/**
* g_dpgettext:
- * @domain: (allow-none): the translation domain to use, or %NULL to use
+ * @domain: (nullable): the translation domain to use, or %NULL to use
* the domain set with textdomain()
* @msgctxtid: a combined message context and message id, separated
* by a \004 character
@@ -248,7 +248,7 @@ g_dpgettext (const gchar *domain,
*/
/**
* g_dpgettext2:
- * @domain: (allow-none): the translation domain to use, or %NULL to use
+ * @domain: (nullable): the translation domain to use, or %NULL to use
* the domain set with textdomain()
* @context: the message context
* @msgid: the message
@@ -351,7 +351,7 @@ _g_dgettext_should_translate (void)
/**
* g_dgettext:
- * @domain: (allow-none): the translation domain to use, or %NULL to use
+ * @domain: (nullable): the translation domain to use, or %NULL to use
* the domain set with textdomain()
* @msgid: message to translate
*
@@ -404,7 +404,7 @@ g_dgettext (const gchar *domain,
/**
* g_dcgettext:
- * @domain: (allow-none): the translation domain to use, or %NULL to use
+ * @domain: (nullable): the translation domain to use, or %NULL to use
* the domain set with textdomain()
* @msgid: message to translate
* @category: a locale category
@@ -431,7 +431,7 @@ g_dcgettext (const gchar *domain,
/**
* g_dngettext:
- * @domain: (allow-none): the translation domain to use, or %NULL to use
+ * @domain: (nullable): the translation domain to use, or %NULL to use
* the domain set with textdomain()
* @msgid: message to translate
* @msgid_plural: plural form of the message
diff --git a/glib/ghash.c b/glib/ghash.c
index 3edba87..198684a 100644
--- a/glib/ghash.c
+++ b/glib/ghash.c
@@ -768,7 +768,7 @@ g_hash_table_iter_init (GHashTableIter *iter,
* g_hash_table_iter_next:
* @iter: an initialized #GHashTableIter
* @key: (out) (optional): a location to store the key
- * @value: (out) (nullable) (optional): a location to store the value
+ * @value: (out) (optional): a location to store the value
*
* Advances @iter and retrieves the key and/or value that are now
* pointed to as a result of this advancement. If %FALSE is returned,
@@ -1155,8 +1155,8 @@ g_hash_table_lookup (GHashTable *hash_table,
* g_hash_table_lookup_extended:
* @hash_table: a #GHashTable
* @lookup_key: the key to look up
- * @orig_key: (out) (optional) (nullable): return location for the original key
- * @value: (out) (optional) (nullable): return location for the value associated
+ * @orig_key: (out) (optional): return location for the original key
+ * @value: (out) (optional): return location for the value associated
* with the key
*
* Looks up a key in the #GHashTable, returning the original key and the
diff --git a/glib/giochannel.c b/glib/giochannel.c
index 37110af..1a3c76b 100644
--- a/glib/giochannel.c
+++ b/glib/giochannel.c
@@ -867,7 +867,7 @@ g_io_channel_get_buffer_size (GIOChannel *channel)
/**
* g_io_channel_set_line_term:
* @channel: a #GIOChannel
- * @line_term: (allow-none): The line termination string. Use %NULL for
+ * @line_term: (nullable): The line termination string. Use %NULL for
* autodetect. Autodetection breaks on "\n", "\r\n", "\r", "\0",
* and the Unicode paragraph separator. Autodetection should not be
* used for anything other than file-based channels.
@@ -1264,7 +1264,7 @@ g_io_channel_get_buffered (GIOChannel *channel)
/**
* g_io_channel_set_encoding:
* @channel: a #GIOChannel
- * @encoding: (allow-none): the encoding type
+ * @encoding: (nullable): the encoding type
* @error: location to store an error of type #GConvertError
*
* Sets the encoding for the input/output of the channel.
@@ -1626,8 +1626,8 @@ reencode:
* line terminator. This data should be freed with g_free()
* when no longer needed. This is a nul-terminated string.
* If a @length of zero is returned, this will be %NULL instead.
- * @length: (allow-none) (out): location to store length of the read data, or %NULL
- * @terminator_pos: (allow-none) (out): location to store position of line terminator, or %NULL
+ * @length: (out) (optional): location to store length of the read data, or %NULL
+ * @terminator_pos: (out) (optional): location to store position of line terminator, or %NULL
* @error: A location to return an error of type #GConvertError
* or #GIOChannelError
*
@@ -1677,7 +1677,7 @@ g_io_channel_read_line (GIOChannel *channel,
* @buffer: a #GString into which the line will be written.
* If @buffer already contains data, the old data will
* be overwritten.
- * @terminator_pos: (allow-none): location to store position of line terminator, or %NULL
+ * @terminator_pos: (nullable): location to store position of line terminator, or %NULL
* @error: a location to store an error of type #GConvertError
* or #GIOChannelError
*
@@ -1972,7 +1972,7 @@ g_io_channel_read_to_end (GIOChannel *channel,
* @count: (in): the size of the buffer. Note that the buffer may not be
* complelely filled even if there is data in the buffer if the
* remaining data is not a complete character.
- * @bytes_read: (allow-none) (out): The number of bytes read. This may be
+ * @bytes_read: (out) (optional): The number of bytes read. This may be
* zero even on success if count < 6 and the channel's encoding
* is non-%NULL. This indicates that the next UTF-8 character is
* too wide for the buffer.
diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c
index 70d8fda..a5375f7 100644
--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
@@ -961,7 +961,7 @@ g_key_file_load_from_bytes (GKeyFile *key_file,
* @key_file: an empty #GKeyFile struct
* @file: (type filename): a relative path to a filename to open and parse
* @search_dirs: (array zero-terminated=1) (element-type filename): %NULL-terminated array of directories to
search
- * @full_path: (out) (type filename) (allow-none): return location for a string containing the full path
+ * @full_path: (out) (type filename) (optional): return location for a string containing the full path
* of the file, or %NULL
* @flags: flags from #GKeyFileFlags
* @error: return location for a #GError, or %NULL
@@ -1035,7 +1035,7 @@ g_key_file_load_from_dirs (GKeyFile *key_file,
* g_key_file_load_from_data_dirs:
* @key_file: an empty #GKeyFile struct
* @file: (type filename): a relative path to a filename to open and parse
- * @full_path: (out) (type filename) (allow-none): return location for a string containing the full path
+ * @full_path: (out) (type filename) (optional): return location for a string containing the full path
* of the file, or %NULL
* @flags: flags from #GKeyFileFlags
* @error: return location for a #GError, or %NULL
@@ -1472,7 +1472,7 @@ g_key_file_flush_parse_buffer (GKeyFile *key_file,
/**
* g_key_file_to_data:
* @key_file: a #GKeyFile
- * @length: (out) (allow-none): return location for the length of the
+ * @length: (out) (optional): return location for the length of the
* returned string, or %NULL
* @error: return location for a #GError, or %NULL
*
@@ -1542,7 +1542,7 @@ g_key_file_to_data (GKeyFile *key_file,
* g_key_file_get_keys:
* @key_file: a #GKeyFile
* @group_name: a group name
- * @length: (out) (allow-none): return location for the number of keys returned, or %NULL
+ * @length: (out) (optional): return location for the number of keys returned, or %NULL
* @error: return location for a #GError, or %NULL
*
* Returns all keys for the group name @group_name. The array of
@@ -1640,7 +1640,7 @@ g_key_file_get_start_group (GKeyFile *key_file)
/**
* g_key_file_get_groups:
* @key_file: a #GKeyFile
- * @length: (out) (allow-none): return location for the number of returned groups, or %NULL
+ * @length: (out) (optional): return location for the number of returned groups, or %NULL
*
* Returns all groups in the key file loaded with @key_file.
* The array of returned groups will be %NULL-terminated, so
@@ -1934,7 +1934,7 @@ g_key_file_set_string (GKeyFile *key_file,
* @key_file: a #GKeyFile
* @group_name: a group name
* @key: a key
- * @length: (out) (allow-none): return location for the number of returned strings, or %NULL
+ * @length: (out) (optional): return location for the number of returned strings, or %NULL
* @error: return location for a #GError, or %NULL
*
* Returns the values associated with @key under @group_name.
@@ -2110,7 +2110,7 @@ g_key_file_set_locale_string (GKeyFile *key_file,
* @key_file: a #GKeyFile
* @group_name: a group name
* @key: a key
- * @locale: (allow-none): a locale identifier or %NULL
+ * @locale: (nullable): a locale identifier or %NULL
* @error: return location for a #GError, or %NULL
*
* Returns the value associated with @key under @group_name
@@ -2197,8 +2197,8 @@ g_key_file_get_locale_string (GKeyFile *key_file,
* @key_file: a #GKeyFile
* @group_name: a group name
* @key: a key
- * @locale: (allow-none): a locale identifier or %NULL
- * @length: (out) (allow-none): return location for the number of returned strings or %NULL
+ * @locale: (nullable): a locale identifier or %NULL
+ * @length: (out) (optional): return location for the number of returned strings or %NULL
* @error: return location for a #GError or %NULL
*
* Returns the values associated with @key under @group_name
@@ -3255,8 +3255,8 @@ g_key_file_set_top_comment (GKeyFile *key_file,
/**
* g_key_file_set_comment:
* @key_file: a #GKeyFile
- * @group_name: (allow-none): a group name, or %NULL
- * @key: (allow-none): a key
+ * @group_name: (nullable): a group name, or %NULL
+ * @key: (nullable): a key
* @comment: a comment
* @error: return location for a #GError
*
@@ -3486,7 +3486,7 @@ g_key_file_get_top_comment (GKeyFile *key_file,
/**
* g_key_file_get_comment:
* @key_file: a #GKeyFile
- * @group_name: (allow-none): a group name, or %NULL
+ * @group_name: (nullable): a group name, or %NULL
* @key: a key
* @error: return location for a #GError
*
@@ -3520,8 +3520,8 @@ g_key_file_get_comment (GKeyFile *key_file,
/**
* g_key_file_remove_comment:
* @key_file: a #GKeyFile
- * @group_name: (allow-none): a group name, or %NULL
- * @key: (allow-none): a key
+ * @group_name: (nullable): a group name, or %NULL
+ * @key: (nullable): a key
* @error: return location for a #GError
*
* Removes a comment above @key from @group_name.
diff --git a/glib/glib-init.c b/glib/glib-init.c
index 8923720..30a9654 100644
--- a/glib/glib-init.c
+++ b/glib/glib-init.c
@@ -110,7 +110,7 @@ G_STATIC_ASSERT (sizeof (int) == sizeof (gint32));
/**
* g_parse_debug_string:
- * @string: (allow-none): a list of debug options separated by colons, spaces, or
+ * @string: (nullable): a list of debug options separated by colons, spaces, or
* commas, or %NULL.
* @keys: (array length=nkeys): pointer to an array of #GDebugKey which associate
* strings with bit flags.
diff --git a/glib/gmain.c b/glib/gmain.c
index 4f90574..5aea34f 100644
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -726,7 +726,7 @@ static GPrivate thread_context_stack = G_PRIVATE_INIT (free_context_stack);
/**
* g_main_context_push_thread_default:
- * @context: (allow-none): a #GMainContext, or %NULL for the global default context
+ * @context: (nullable): a #GMainContext, or %NULL for the global default context
*
* Acquires @context and sets it as the thread-default context for the
* current thread. This will cause certain asynchronous operations
@@ -797,7 +797,7 @@ g_main_context_push_thread_default (GMainContext *context)
/**
* g_main_context_pop_thread_default:
- * @context: (allow-none): a #GMainContext object, or %NULL
+ * @context: (nullable): a #GMainContext object, or %NULL
*
* Pops @context off the thread-default context stack (verifying that
* it was on the top of the stack).
@@ -1173,7 +1173,7 @@ g_source_attach_unlocked (GSource *source,
/**
* g_source_attach:
* @source: a #GSource
- * @context: (allow-none): a #GMainContext (if %NULL, the default context will be used)
+ * @context: (nullable): a #GMainContext (if %NULL, the default context will be used)
*
* Adds a #GSource to a @context so that it will be executed within
* that context. Remove it by calling g_source_destroy().
@@ -1326,7 +1326,7 @@ g_source_get_id (GSource *source)
* g_main_current_source(). But calling this function on a source
* whose #GMainContext has been destroyed is an error.
*
- * Returns: (transfer none) (allow-none): the #GMainContext with which the
+ * Returns: (transfer none) (nullable): the #GMainContext with which the
* source is associated, or %NULL if the context has not
* yet been added to a source.
**/
@@ -1622,7 +1622,7 @@ g_source_set_callback_indirect (GSource *source,
* @source: the source
* @func: a callback function
* @data: the data to pass to callback function
- * @notify: (allow-none): a function to call when @data is no longer in use, or %NULL.
+ * @notify: (nullable): a function to call when @data is no longer in use, or %NULL.
*
* Sets the callback function for a source. The callback for a source is
* called from the source's dispatch function.
@@ -2156,7 +2156,7 @@ g_source_unref (GSource *source)
/**
* g_main_context_find_source_by_id:
- * @context: (allow-none): a #GMainContext (if %NULL, the default context will be used)
+ * @context: (nullable): a #GMainContext (if %NULL, the default context will be used)
* @source_id: the source ID, as returned by g_source_get_id().
*
* Finds a #GSource given a pair of context and ID.
@@ -2197,7 +2197,7 @@ g_main_context_find_source_by_id (GMainContext *context,
/**
* g_main_context_find_source_by_funcs_user_data:
- * @context: (allow-none): a #GMainContext (if %NULL, the default context will be used).
+ * @context: (nullable): a #GMainContext (if %NULL, the default context will be used).
* @funcs: the @source_funcs passed to g_source_new().
* @user_data: the user data from the callback.
*
@@ -3937,7 +3937,7 @@ g_main_context_iterate (GMainContext *context,
/**
* g_main_context_pending:
- * @context: (allow-none): a #GMainContext (if %NULL, the default context will be used)
+ * @context: (nullable): a #GMainContext (if %NULL, the default context will be used)
*
* Checks if any sources have pending events for the given context.
*
@@ -3960,7 +3960,7 @@ g_main_context_pending (GMainContext *context)
/**
* g_main_context_iteration:
- * @context: (allow-none): a #GMainContext (if %NULL, the default context will be used)
+ * @context: (nullable): a #GMainContext (if %NULL, the default context will be used)
* @may_block: whether the call may block.
*
* Runs a single iteration for the given main loop. This involves
@@ -3995,7 +3995,7 @@ g_main_context_iteration (GMainContext *context, gboolean may_block)
/**
* g_main_loop_new:
- * @context: (allow-none): a #GMainContext (if %NULL, the default context will be used).
+ * @context: (nullable): a #GMainContext (if %NULL, the default context will be used).
* @is_running: set to %TRUE to indicate that the loop is running. This
* is not very important since calling g_main_loop_run() will set this to
* %TRUE anyway.
@@ -4285,7 +4285,7 @@ g_main_context_poll (GMainContext *context,
/**
* g_main_context_add_poll:
- * @context: (allow-none): a #GMainContext (or %NULL for the default context)
+ * @context: (nullable): a #GMainContext (or %NULL for the default context)
* @fd: a #GPollFD structure holding information about a file
* descriptor to watch.
* @priority: the priority for this file descriptor which should be
@@ -4751,7 +4751,7 @@ g_timeout_source_new_seconds (guint interval)
* (1/1000ths of a second)
* @function: function to call
* @data: data to pass to @function
- * @notify: (allow-none): function to call when the timeout is removed, or %NULL
+ * @notify: (nullable): function to call when the timeout is removed, or %NULL
*
* Sets a function to be called at regular intervals, with the given
* priority. The function is called repeatedly until it returns
@@ -4861,7 +4861,7 @@ g_timeout_add (guint32 interval,
* @interval: the time between calls to the function, in seconds
* @function: function to call
* @data: data to pass to @function
- * @notify: (allow-none): function to call when the timeout is removed, or %NULL
+ * @notify: (nullable): function to call when the timeout is removed, or %NULL
*
* Sets a function to be called at regular intervals, with @priority.
* The function is called repeatedly until it returns %FALSE, at which
@@ -5415,7 +5415,7 @@ g_child_watch_source_new (GPid pid)
* Windows a handle for a process (which doesn't have to be a child).
* @function: function to call
* @data: data to pass to @function
- * @notify: (allow-none): function to call when the idle is removed, or %NULL
+ * @notify: (nullable): function to call when the idle is removed, or %NULL
*
* Sets a function to be called when the child indicated by @pid
* exits, at the priority @priority.
@@ -5579,7 +5579,7 @@ g_idle_source_new (void)
* range between #G_PRIORITY_DEFAULT_IDLE and #G_PRIORITY_HIGH_IDLE.
* @function: function to call
* @data: data to pass to @function
- * @notify: (allow-none): function to call when the idle is removed, or %NULL
+ * @notify: (nullable): function to call when the idle is removed, or %NULL
*
* Adds a function to be called whenever there are no higher priority
* events pending. If the function returns %FALSE it is automatically
@@ -5667,7 +5667,7 @@ g_idle_remove_by_data (gpointer data)
/**
* g_main_context_invoke:
- * @context: (allow-none): a #GMainContext, or %NULL
+ * @context: (nullable): a #GMainContext, or %NULL
* @function: function to call
* @data: data to pass to @function
*
@@ -5707,11 +5707,11 @@ g_main_context_invoke (GMainContext *context,
/**
* g_main_context_invoke_full:
- * @context: (allow-none): a #GMainContext, or %NULL
+ * @context: (nullable): a #GMainContext, or %NULL
* @priority: the priority at which to run @function
* @function: function to call
* @data: data to pass to @function
- * @notify: (allow-none): a function to call when @data is no longer in use, or %NULL.
+ * @notify: (nullable): a function to call when @data is no longer in use, or %NULL.
*
* Invokes a function in such a way that @context is owned during the
* invocation of @function.
diff --git a/glib/gmarkup.c b/glib/gmarkup.c
index 04ce6e5..9bdd292 100644
--- a/glib/gmarkup.c
+++ b/glib/gmarkup.c
@@ -1910,8 +1910,8 @@ g_markup_parse_context_get_element_stack (GMarkupParseContext *context)
/**
* g_markup_parse_context_get_position:
* @context: a #GMarkupParseContext
- * @line_number: (allow-none): return location for a line number, or %NULL
- * @char_number: (allow-none): return location for a char-on-line number, or %NULL
+ * @line_number: (nullable): return location for a line number, or %NULL
+ * @char_number: (nullable): return location for a char-on-line number, or %NULL
*
* Retrieves the current line number and the number of the character on
* that line. Intended for use in error messages; there are no strict
diff --git a/glib/gmem.c b/glib/gmem.c
index e51f0cd..05dc030 100644
--- a/glib/gmem.c
+++ b/glib/gmem.c
@@ -137,7 +137,7 @@ g_malloc0 (gsize n_bytes)
/**
* g_realloc:
- * @mem: (allow-none): the memory to reallocate
+ * @mem: (nullable): the memory to reallocate
* @n_bytes: new size of the memory in bytes
*
* Reallocates the memory pointed to by @mem, so that it now has space for
@@ -175,7 +175,7 @@ g_realloc (gpointer mem,
/**
* g_free:
- * @mem: (allow-none): the memory to free
+ * @mem: (nullable): the memory to free
*
* Frees the memory pointed to by @mem.
*
@@ -273,7 +273,7 @@ g_try_malloc0 (gsize n_bytes)
/**
* g_try_realloc:
- * @mem: (allow-none): previously-allocated memory, or %NULL.
+ * @mem: (nullable): previously-allocated memory, or %NULL.
* @n_bytes: number of bytes to allocate.
*
* Attempts to realloc @mem to a new size, @n_bytes, and returns %NULL
@@ -357,7 +357,7 @@ g_malloc0_n (gsize n_blocks,
/**
* g_realloc_n:
- * @mem: (allow-none): the memory to reallocate
+ * @mem: (nullable): the memory to reallocate
* @n_blocks: the number of blocks to allocate
* @n_block_bytes: the size of each block in bytes
*
@@ -425,7 +425,7 @@ g_try_malloc0_n (gsize n_blocks,
/**
* g_try_realloc_n:
- * @mem: (allow-none): previously-allocated memory, or %NULL.
+ * @mem: (nullable): previously-allocated memory, or %NULL.
* @n_blocks: the number of blocks to allocate
* @n_block_bytes: the size of each block in bytes
*
diff --git a/glib/gmessages.c b/glib/gmessages.c
index 8f45c3d..8dfc201 100644
--- a/glib/gmessages.c
+++ b/glib/gmessages.c
@@ -717,7 +717,7 @@ g_log_set_fatal_mask (const gchar *log_domain,
/**
* g_log_set_handler:
- * @log_domain: (allow-none): the log domain, or %NULL for the default ""
+ * @log_domain: (nullable): the log domain, or %NULL for the default ""
* application domain
* @log_levels: the log levels to apply the log handler for.
* To handle fatal and recursive messages as well, combine
@@ -770,7 +770,7 @@ g_log_set_handler (const gchar *log_domain,
/**
* g_log_set_handler_full: (rename-to g_log_set_handler)
- * @log_domain: (allow-none): the log domain, or %NULL for the default ""
+ * @log_domain: (nullable): the log domain, or %NULL for the default ""
* application domain
* @log_levels: the log levels to apply the log handler for.
* To handle fatal and recursive messages as well, combine
@@ -1604,7 +1604,7 @@ g_log_structured (const gchar *log_domain,
/**
* g_log_variant:
- * @log_domain: (allow-none): log domain, usually %G_LOG_DOMAIN
+ * @log_domain: (nullable): log domain, usually %G_LOG_DOMAIN
* @log_level: log level, either from #GLogLevelFlags, or a user-defined
* level
* @fields: a dictionary (#GVariant of the type %G_VARIANT_TYPE_VARDICT)
@@ -2517,7 +2517,7 @@ g_assert_warning (const char *log_domain,
/**
* g_test_expect_message:
- * @log_domain: (allow-none): the log domain of the message
+ * @log_domain: (nullable): the log domain of the message
* @log_level: the log level of the message
* @pattern: a glob-style [pattern][glib-Glob-style-pattern-matching]
*
diff --git a/glib/goption.c b/glib/goption.c
index 19ff541..e7d35bc 100644
--- a/glib/goption.c
+++ b/glib/goption.c
@@ -323,7 +323,7 @@ G_DEFINE_QUARK (g-option-context-error-quark, g_option_error)
/**
* g_option_context_new:
- * @parameter_string: (allow-none): a string which is displayed in
+ * @parameter_string: (nullable): a string which is displayed in
* the first line of `--help` output, after the usage summary
* `programname [OPTION...]`
*
@@ -637,7 +637,7 @@ g_option_context_get_main_group (GOptionContext *context)
* g_option_context_add_main_entries:
* @context: a #GOptionContext
* @entries: a %NULL-terminated array of #GOptionEntrys
- * @translation_domain: (allow-none): a translation domain to use for translating
+ * @translation_domain: (nullable): a translation domain to use for translating
* the `--help` output for the options in @entries
* with gettext(), or %NULL
*
@@ -807,7 +807,7 @@ context_has_h_entry (GOptionContext *context)
* g_option_context_get_help:
* @context: a #GOptionContext
* @main_help: if %TRUE, only include the main group
- * @group: (allow-none): the #GOptionGroup to create help for, or %NULL
+ * @group: (nullable): the #GOptionGroup to create help for, or %NULL
*
* Returns a formatted, translated help text for the given context.
* To obtain the text produced by `--help`, call
@@ -1868,8 +1868,8 @@ platform_get_argv0 (void)
/**
* g_option_context_parse:
* @context: a #GOptionContext
- * @argc: (inout) (allow-none): a pointer to the number of command line arguments
- * @argv: (inout) (array length=argc) (allow-none): a pointer to the array of command line arguments
+ * @argc: (inout) (optional): a pointer to the number of command line arguments
+ * @argv: (inout) (array length=argc) (optional): a pointer to the array of command line arguments
* @error: a return location for errors
*
* Parses the command line arguments, recognizing options
@@ -2237,9 +2237,9 @@ g_option_context_parse (GOptionContext *context,
* @help_description: a description for the `--help-`@name option.
* This string is translated using the translation domain or translation function
* of the group
- * @user_data: (allow-none): user data that will be passed to the pre- and post-parse hooks,
+ * @user_data: (nullable): user data that will be passed to the pre- and post-parse hooks,
* the error hook and to callbacks of %G_OPTION_ARG_CALLBACK options, or %NULL
- * @destroy: (allow-none): a function that will be called to free @user_data, or %NULL
+ * @destroy: (nullable): a function that will be called to free @user_data, or %NULL
*
* Creates a new #GOptionGroup.
*
@@ -2399,8 +2399,8 @@ g_option_group_add_entries (GOptionGroup *group,
/**
* g_option_group_set_parse_hooks:
* @group: a #GOptionGroup
- * @pre_parse_func: (allow-none): a function to call before parsing, or %NULL
- * @post_parse_func: (allow-none): a function to call after parsing, or %NULL
+ * @pre_parse_func: (nullable): a function to call before parsing, or %NULL
+ * @post_parse_func: (nullable): a function to call after parsing, or %NULL
*
* Associates two functions with @group which will be called
* from g_option_context_parse() before the first option is parsed
@@ -2449,9 +2449,9 @@ g_option_group_set_error_hook (GOptionGroup *group,
/**
* g_option_group_set_translate_func:
* @group: a #GOptionGroup
- * @func: (allow-none): the #GTranslateFunc, or %NULL
- * @data: (allow-none): user data to pass to @func, or %NULL
- * @destroy_notify: (allow-none): a function which gets called to free @data, or %NULL
+ * @func: (nullable): the #GTranslateFunc, or %NULL
+ * @data: (nullable): user data to pass to @func, or %NULL
+ * @destroy_notify: (nullable): a function which gets called to free @data, or %NULL
*
* Sets the function which is used to translate user-visible strings,
* for `--help` output. Different groups can use different
@@ -2510,9 +2510,9 @@ g_option_group_set_translation_domain (GOptionGroup *group,
/**
* g_option_context_set_translate_func:
* @context: a #GOptionContext
- * @func: (allow-none): the #GTranslateFunc, or %NULL
- * @data: (allow-none): user data to pass to @func, or %NULL
- * @destroy_notify: (allow-none): a function which gets called to free @data, or %NULL
+ * @func: (nullable): the #GTranslateFunc, or %NULL
+ * @data: (nullable): user data to pass to @func, or %NULL
+ * @destroy_notify: (nullable): a function which gets called to free @data, or %NULL
*
* Sets the function which is used to translate the contexts
* user-visible strings, for `--help` output. If @func is %NULL,
@@ -2569,7 +2569,7 @@ g_option_context_set_translation_domain (GOptionContext *context,
/**
* g_option_context_set_summary:
* @context: a #GOptionContext
- * @summary: (allow-none): a string to be shown in `--help` output
+ * @summary: (nullable): a string to be shown in `--help` output
* before the list of options, or %NULL
*
* Adds a string to be displayed in `--help` output before the list
@@ -2613,7 +2613,7 @@ g_option_context_get_summary (GOptionContext *context)
/**
* g_option_context_set_description:
* @context: a #GOptionContext
- * @description: (allow-none): a string to be shown in `--help` output
+ * @description: (nullable): a string to be shown in `--help` output
* after the list of options, or %NULL
*
* Adds a string to be displayed in `--help` output after the list
diff --git a/glib/gpattern.c b/glib/gpattern.c
index aa04502..16e70b8 100644
--- a/glib/gpattern.c
+++ b/glib/gpattern.c
@@ -162,7 +162,7 @@ g_pattern_ph_match (const gchar *match_pattern,
* @string_length: the length of @string (in bytes, i.e. strlen(),
* not g_utf8_strlen())
* @string: the UTF-8 encoded string to match
- * @string_reversed: (allow-none): the reverse of @string or %NULL
+ * @string_reversed: (nullable): the reverse of @string or %NULL
*
* Matches a string against a compiled pattern. Passing the correct
* length of the string given is mandatory. The reversed string can be
diff --git a/glib/gquark.c b/glib/gquark.c
index 9e51a92..f2b3201 100644
--- a/glib/gquark.c
+++ b/glib/gquark.c
@@ -118,7 +118,7 @@ g_quark_init (void)
/**
* g_quark_try_string:
- * @string: (allow-none): a string
+ * @string: (nullable): a string
*
* Gets the #GQuark associated with the given string, or 0 if string is
* %NULL or it has no associated #GQuark.
@@ -192,7 +192,7 @@ quark_from_string (const gchar *string,
/**
* g_quark_from_string:
- * @string: (allow-none): a string
+ * @string: (nullable): a string
*
* Gets the #GQuark identifying the given string. If the string does
* not currently have an associated #GQuark, a new #GQuark is created,
@@ -217,7 +217,7 @@ g_quark_from_string (const gchar *string)
/**
* g_quark_from_static_string:
- * @string: (allow-none): a string
+ * @string: (nullable): a string
*
* Gets the #GQuark identifying the given (static) string. If the
* string does not currently have an associated #GQuark, a new #GQuark
@@ -303,7 +303,7 @@ quark_new (gchar *string)
/**
* g_intern_string:
- * @string: (allow-none): a string
+ * @string: (nullable): a string
*
* Returns a canonical representation for @string. Interned strings
* can be compared for equality by comparing the pointers, instead of
@@ -332,7 +332,7 @@ g_intern_string (const gchar *string)
/**
* g_intern_static_string:
- * @string: (allow-none): a static string
+ * @string: (nullable): a static string
*
* Returns a canonical representation for @string. Interned strings
* can be compared for equality by comparing the pointers, instead of
diff --git a/glib/gregex.c b/glib/gregex.c
index b68ee95..3cdc668 100644
--- a/glib/gregex.c
+++ b/glib/gregex.c
@@ -678,7 +678,7 @@ g_match_info_unref (GMatchInfo *match_info)
/**
* g_match_info_free:
- * @match_info: (allow-none): a #GMatchInfo, or %NULL
+ * @match_info: (nullable): a #GMatchInfo, or %NULL
*
* If @match_info is not %NULL, calls g_match_info_unref(); otherwise does
* nothing.
@@ -895,7 +895,7 @@ g_match_info_is_partial_match (const GMatchInfo *match_info)
/**
* g_match_info_expand_references:
- * @match_info: (allow-none): a #GMatchInfo or %NULL
+ * @match_info: (nullable): a #GMatchInfo or %NULL
* @string_to_expand: the string to expand
* @error: location to store the error occurring, or %NULL to ignore errors
*
@@ -917,7 +917,7 @@ g_match_info_is_partial_match (const GMatchInfo *match_info)
* Use g_regex_check_replacement() to find out whether @string_to_expand
* contains references.
*
- * Returns: (allow-none): the expanded string, or %NULL if an error occurred
+ * Returns: (nullable): the expanded string, or %NULL if an error occurred
*
* Since: 2.14
*/
@@ -978,7 +978,7 @@ g_match_info_expand_references (const GMatchInfo *match_info,
* The string is fetched from the string passed to the match function,
* so you cannot call this function after freeing the string.
*
- * Returns: (allow-none): The matched substring, or %NULL if an error
+ * Returns: (nullable): The matched substring, or %NULL if an error
* occurred. You have to free the string yourself
*
* Since: 2.14
@@ -1011,9 +1011,9 @@ g_match_info_fetch (const GMatchInfo *match_info,
* g_match_info_fetch_pos:
* @match_info: #GMatchInfo structure
* @match_num: number of the sub expression
- * @start_pos: (out) (allow-none): pointer to location where to store
+ * @start_pos: (out) (optional): pointer to location where to store
* the start position, or %NULL
- * @end_pos: (out) (allow-none): pointer to location where to store
+ * @end_pos: (out) (optional): pointer to location where to store
* the end position, or %NULL
*
* Retrieves the position in bytes of the @match_num'th capturing
@@ -1109,7 +1109,7 @@ get_matched_substring_number (const GMatchInfo *match_info,
* The string is fetched from the string passed to the match function,
* so you cannot call this function after freeing the string.
*
- * Returns: (allow-none): The matched substring, or %NULL if an error
+ * Returns: (nullable): The matched substring, or %NULL if an error
* occurred. You have to free the string yourself
*
* Since: 2.14
@@ -1136,9 +1136,9 @@ g_match_info_fetch_named (const GMatchInfo *match_info,
* g_match_info_fetch_named_pos:
* @match_info: #GMatchInfo structure
* @name: name of the subexpression
- * @start_pos: (out) (allow-none): pointer to location where to store
+ * @start_pos: (out) (optional): pointer to location where to store
* the start position, or %NULL
- * @end_pos: (out) (allow-none): pointer to location where to store
+ * @end_pos: (out) (optional): pointer to location where to store
* the end position, or %NULL
*
* Retrieves the position in bytes of the capturing parentheses named @name.
@@ -1660,7 +1660,7 @@ g_regex_match_simple (const gchar *pattern,
* @regex: a #GRegex structure from g_regex_new()
* @string: the string to scan for matches
* @match_options: match options
- * @match_info: (out) (allow-none): pointer to location where to store
+ * @match_info: (out) (optional): pointer to location where to store
* the #GMatchInfo, or %NULL if you do not need it
*
* Scans for a match in string for the pattern in @regex.
@@ -1723,7 +1723,7 @@ g_regex_match (const GRegex *regex,
* @string_len: the length of @string, or -1 if @string is nul-terminated
* @start_position: starting index of the string to match, in bytes
* @match_options: match options
- * @match_info: (out) (allow-none): pointer to location where to store
+ * @match_info: (out) (optional): pointer to location where to store
* the #GMatchInfo, or %NULL if you do not need it
* @error: location to store the error occurring, or %NULL to ignore errors
*
@@ -1815,7 +1815,7 @@ g_regex_match_full (const GRegex *regex,
* @regex: a #GRegex structure from g_regex_new()
* @string: the string to scan for matches
* @match_options: match options
- * @match_info: (out) (allow-none): pointer to location where to store
+ * @match_info: (out) (optional): pointer to location where to store
* the #GMatchInfo, or %NULL if you do not need it
*
* Using the standard algorithm for regular expression matching only
@@ -1854,7 +1854,7 @@ g_regex_match_all (const GRegex *regex,
* @string_len: the length of @string, or -1 if @string is nul-terminated
* @start_position: starting index of the string to match, in bytes
* @match_options: match options
- * @match_info: (out) (allow-none): pointer to location where to store
+ * @match_info: (out) (optional): pointer to location where to store
* the #GMatchInfo, or %NULL if you do not need it
* @error: location to store the error occurring, or %NULL to ignore errors
*
@@ -2997,7 +2997,7 @@ g_regex_replace_eval (const GRegex *regex,
/**
* g_regex_check_replacement:
* @replacement: the replacement string
- * @has_references: (out) (allow-none): location to store information about
+ * @has_references: (out) (optional): location to store information about
* references in @replacement or %NULL
* @error: location to store error
*
diff --git a/glib/gsequence.c b/glib/gsequence.c
index 8482b8b..b813ee8 100644
--- a/glib/gsequence.c
+++ b/glib/gsequence.c
@@ -239,7 +239,7 @@ iter_compare (GSequenceIter *node1,
/**
* g_sequence_new:
- * @data_destroy: (allow-none): a #GDestroyNotify function, or %NULL
+ * @data_destroy: (nullable): a #GDestroyNotify function, or %NULL
*
* Creates a new GSequence. The @data_destroy function, if non-%NULL will
* be called on all items when the sequence is destroyed and on items that
diff --git a/glib/gspawn.c b/glib/gspawn.c
index 6ef705d..929db49 100644
--- a/glib/gspawn.c
+++ b/glib/gspawn.c
@@ -105,13 +105,13 @@ G_DEFINE_QUARK (g-spawn-exit-error-quark, g_spawn_exit_error)
/**
* g_spawn_async:
- * @working_directory: (type filename) (allow-none): child's current working directory, or %NULL to inherit
parent's
+ * @working_directory: (type filename) (nullable): child's current working directory, or %NULL to inherit
parent's
* @argv: (array zero-terminated=1): child's argument vector
- * @envp: (array zero-terminated=1) (allow-none): child's environment, or %NULL to inherit parent's
+ * @envp: (array zero-terminated=1) (nullable): child's environment, or %NULL to inherit parent's
* @flags: flags from #GSpawnFlags
- * @child_setup: (scope async) (allow-none): function to run in the child just before exec()
+ * @child_setup: (scope async) (nullable): function to run in the child just before exec()
* @user_data: (closure): user data for @child_setup
- * @child_pid: (out) (allow-none): return location for child process reference, or %NULL
+ * @child_pid: (out) (optional): return location for child process reference, or %NULL
* @error: return location for error
*
* See g_spawn_async_with_pipes() for a full description; this function
@@ -215,15 +215,15 @@ read_data (GString *str,
/**
* g_spawn_sync:
- * @working_directory: (type filename) (allow-none): child's current working directory, or %NULL to inherit
parent's
+ * @working_directory: (type filename) (nullable): child's current working directory, or %NULL to inherit
parent's
* @argv: (array zero-terminated=1): child's argument vector
- * @envp: (array zero-terminated=1) (allow-none): child's environment, or %NULL to inherit parent's
+ * @envp: (array zero-terminated=1) (nullable): child's environment, or %NULL to inherit parent's
* @flags: flags from #GSpawnFlags
- * @child_setup: (scope async) (allow-none): function to run in the child just before exec()
+ * @child_setup: (scope async) (nullable): function to run in the child just before exec()
* @user_data: (closure): user data for @child_setup
- * @standard_output: (out) (array zero-terminated=1) (element-type guint8) (allow-none): return location for
child output, or %NULL
- * @standard_error: (out) (array zero-terminated=1) (element-type guint8) (allow-none): return location for
child error messages, or %NULL
- * @exit_status: (out) (allow-none): return location for child exit status, as returned by waitpid(), or
%NULL
+ * @standard_output: (out) (array zero-terminated=1) (element-type guint8) (optional): return location for
child output, or %NULL
+ * @standard_error: (out) (array zero-terminated=1) (element-type guint8) (optional): return location for
child error messages, or %NULL
+ * @exit_status: (out) (optional): return location for child exit status, as returned by waitpid(), or %NULL
* @error: return location for error, or %NULL
*
* Executes a child synchronously (waits for the child to exit before returning).
@@ -467,16 +467,16 @@ g_spawn_sync (const gchar *working_directory,
/**
* g_spawn_async_with_pipes:
- * @working_directory: (type filename) (allow-none): child's current working directory, or %NULL to inherit
parent's, in the GLib file name encoding
+ * @working_directory: (type filename) (nullable): child's current working directory, or %NULL to inherit
parent's, in the GLib file name encoding
* @argv: (array zero-terminated=1): child's argument vector, in the GLib file name encoding
- * @envp: (array zero-terminated=1) (allow-none): child's environment, or %NULL to inherit parent's, in the
GLib file name encoding
+ * @envp: (array zero-terminated=1) (nullable): child's environment, or %NULL to inherit parent's, in the
GLib file name encoding
* @flags: flags from #GSpawnFlags
- * @child_setup: (scope async) (allow-none): function to run in the child just before exec()
+ * @child_setup: (scope async) (nullable): function to run in the child just before exec()
* @user_data: (closure): user data for @child_setup
- * @child_pid: (out) (allow-none): return location for child process ID, or %NULL
- * @standard_input: (out) (allow-none): return location for file descriptor to write to child's stdin, or
%NULL
- * @standard_output: (out) (allow-none): return location for file descriptor to read child's stdout, or %NULL
- * @standard_error: (out) (allow-none): return location for file descriptor to read child's stderr, or %NULL
+ * @child_pid: (out) (optional): return location for child process ID, or %NULL
+ * @standard_input: (out) (optional): return location for file descriptor to write to child's stdin, or %NULL
+ * @standard_output: (out) (optional): return location for file descriptor to read child's stdout, or %NULL
+ * @standard_error: (out) (optional): return location for file descriptor to read child's stderr, or %NULL
* @error: return location for error
*
* Executes a child program asynchronously (your program will not
@@ -677,9 +677,9 @@ g_spawn_async_with_pipes (const gchar *working_directory,
/**
* g_spawn_command_line_sync:
* @command_line: a command line
- * @standard_output: (out) (array zero-terminated=1) (element-type guint8) (allow-none): return location for
child output
- * @standard_error: (out) (array zero-terminated=1) (element-type guint8) (allow-none): return location for
child errors
- * @exit_status: (out) (allow-none): return location for child exit status, as returned by waitpid()
+ * @standard_output: (out) (array zero-terminated=1) (element-type guint8) (optional): return location for
child output
+ * @standard_error: (out) (array zero-terminated=1) (element-type guint8) (optional): return location for
child errors
+ * @exit_status: (out) (optional): return location for child exit status, as returned by waitpid()
* @error: return location for errors
*
* A simple version of g_spawn_sync() with little-used parameters
diff --git a/glib/gstdio.c b/glib/gstdio.c
index 588b075..611944c 100644
--- a/glib/gstdio.c
+++ b/glib/gstdio.c
@@ -753,7 +753,7 @@ g_fopen (const gchar *filename,
* @filename: (type filename): a pathname in the GLib file name encoding
* (UTF-8 on Windows)
* @mode: a string describing the mode in which the file should be opened
- * @stream: (allow-none): an existing stream which will be reused, or %NULL
+ * @stream: (nullable): an existing stream which will be reused, or %NULL
*
* A wrapper for the POSIX freopen() function. The freopen() function
* opens a file and associates it with an existing stream.
diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
index 00c484d..f8dc0b1 100644
--- a/glib/gstrfuncs.c
+++ b/glib/gstrfuncs.c
@@ -1964,7 +1964,7 @@ g_strncasecmp (const gchar *s1,
/**
* g_strdelimit:
* @string: the string to convert
- * @delimiters: (allow-none): a string containing the current delimiters,
+ * @delimiters: (nullable): a string containing the current delimiters,
* or %NULL to use the standard delimiters defined in #G_STR_DELIMITERS
* @new_delimiter: the new delimiter character
*
@@ -2531,7 +2531,7 @@ g_strdupv (gchar **str_array)
/**
* g_strjoinv:
- * @separator: (allow-none): a string to insert between each of the
+ * @separator: (nullable): a string to insert between each of the
* strings, or %NULL
* @str_array: a %NULL-terminated array of strings to join
*
@@ -2588,7 +2588,7 @@ g_strjoinv (const gchar *separator,
/**
* g_strjoin:
- * @separator: (allow-none): a string to insert between each of the
+ * @separator: (nullable): a string to insert between each of the
* strings, or %NULL
* @...: a %NULL-terminated list of strings to join
*
@@ -2979,7 +2979,7 @@ split_words (const gchar *value)
/**
* g_str_tokenize_and_fold:
* @string: a string
- * @translit_locale: (allow-none): the language code (like 'de' or
+ * @translit_locale: (nullable): the language code (like 'de' or
* 'en_GB') from which @string originates
* @ascii_alternates: (out) (transfer full) (array zero-terminated=1): a
* return location for ASCII alternates
diff --git a/glib/gtestutils.c b/glib/gtestutils.c
index d4b0fbe..e08b044 100644
--- a/glib/gtestutils.c
+++ b/glib/gtestutils.c
@@ -1786,7 +1786,7 @@ g_test_fail (void)
/**
* g_test_incomplete:
- * @msg: (allow-none): explanation
+ * @msg: (nullable): explanation
*
* Indicates that a test failed because of some incomplete
* functionality. This function can be called multiple times
@@ -1811,7 +1811,7 @@ g_test_incomplete (const gchar *msg)
/**
* g_test_skip:
- * @msg: (allow-none): explanation
+ * @msg: (nullable): explanation
*
* Indicates that a test was skipped.
*
@@ -2548,8 +2548,8 @@ g_assertion_message_error (const char *domain,
/**
* g_strcmp0:
- * @str1: (allow-none): a C string or %NULL
- * @str2: (allow-none): another C string or %NULL
+ * @str1: (nullable): a C string or %NULL
+ * @str2: (nullable): another C string or %NULL
*
* Compares @str1 and @str2 like strcmp(). Handles %NULL
* gracefully by sorting it before non-%NULL strings.
@@ -2866,7 +2866,7 @@ g_test_trap_fork (guint64 usec_timeout,
/**
* g_test_trap_subprocess:
- * @test_path: (allow-none): Test to run in a subprocess
+ * @test_path: (nullable): Test to run in a subprocess
* @usec_timeout: Timeout for the subprocess test in micro seconds.
* @test_flags: Flags to modify subprocess behaviour.
*
diff --git a/glib/gthread.c b/glib/gthread.c
index 623ac63..fdb3673 100644
--- a/glib/gthread.c
+++ b/glib/gthread.c
@@ -788,7 +788,7 @@ g_thread_proxy (gpointer data)
/**
* g_thread_new:
- * @name: (allow-none): an (optional) name for the new thread
+ * @name: (nullable): an (optional) name for the new thread
* @func: a function to execute in the new thread
* @data: an argument to supply to the new thread
*
@@ -834,7 +834,7 @@ g_thread_new (const gchar *name,
/**
* g_thread_try_new:
- * @name: (allow-none): an (optional) name for the new thread
+ * @name: (nullable): an (optional) name for the new thread
* @func: a function to execute in the new thread
* @data: an argument to supply to the new thread
* @error: return location for error, or %NULL
diff --git a/glib/gtimezone.c b/glib/gtimezone.c
index 2e2369c..89aa83e 100644
--- a/glib/gtimezone.c
+++ b/glib/gtimezone.c
@@ -1279,7 +1279,7 @@ rules_from_identifier (const gchar *identifier,
/* Construction {{{1 */
/**
* g_time_zone_new:
- * @identifier: (allow-none): a timezone identifier
+ * @identifier: (nullable): a timezone identifier
*
* Creates a #GTimeZone corresponding to @identifier.
*
diff --git a/glib/gtranslit.c b/glib/gtranslit.c
index c9f07f8..b1e0dff 100644
--- a/glib/gtranslit.c
+++ b/glib/gtranslit.c
@@ -301,7 +301,7 @@ get_default_item_id (void)
/**
* g_str_to_ascii:
* @str: a string, in UTF-8
- * @from_locale: (allow-none): the source locale, if known
+ * @from_locale: (nullable): the source locale, if known
*
* Transliterate @str to plain ASCII.
*
diff --git a/glib/gunidecomp.c b/glib/gunidecomp.c
index 44943c8..04100eb 100644
--- a/glib/gunidecomp.c
+++ b/glib/gunidecomp.c
@@ -686,7 +686,7 @@ g_unichar_compose (gunichar a,
* g_unichar_fully_decompose:
* @ch: a Unicode character.
* @compat: whether perform canonical or compatibility decomposition
- * @result: (allow-none): location to store decomposed result, or %NULL
+ * @result: (nullable): location to store decomposed result, or %NULL
* @result_len: length of @result
*
* Computes the canonical or compatibility decomposition of a
diff --git a/glib/gurifuncs.c b/glib/gurifuncs.c
index 44cf82a..1978de1 100644
--- a/glib/gurifuncs.c
+++ b/glib/gurifuncs.c
@@ -62,9 +62,9 @@ unescape_character (const char *scanner)
/**
* g_uri_unescape_segment:
- * @escaped_string: (allow-none): A string, may be %NULL
- * @escaped_string_end: (allow-none): Pointer to end of @escaped_string, may be %NULL
- * @illegal_characters: (allow-none): An optional string of illegal characters not to be allowed, may be
%NULL
+ * @escaped_string: (nullable): A string, may be %NULL
+ * @escaped_string_end: (nullable): Pointer to end of @escaped_string, may be %NULL
+ * @illegal_characters: (nullable): An optional string of illegal characters not to be allowed, may be %NULL
*
* Unescapes a segment of an escaped string.
*
@@ -138,7 +138,7 @@ g_uri_unescape_segment (const char *escaped_string,
/**
* g_uri_unescape_string:
* @escaped_string: an escaped string to be unescaped.
- * @illegal_characters: (allow-none): a string of illegal characters not to be
+ * @illegal_characters: (nullable): a string of illegal characters not to be
* allowed, or %NULL.
*
* Unescapes a whole escaped string.
@@ -217,7 +217,7 @@ g_uri_parse_scheme (const char *uri)
/**
* g_uri_escape_string:
* @unescaped: the unescaped input string.
- * @reserved_chars_allowed: (allow-none): a string of reserved characters that
+ * @reserved_chars_allowed: (nullable): a string of reserved characters that
* are allowed to be used, or %NULL.
* @allow_utf8: %TRUE if the result can include UTF-8 characters.
*
diff --git a/glib/gutf8.c b/glib/gutf8.c
index 4c5cacc..a3fe787 100644
--- a/glib/gutf8.c
+++ b/glib/gutf8.c
@@ -1627,7 +1627,7 @@ fast_validate_len (const char *str,
* g_utf8_validate:
* @str: (array length=max_len) (element-type guint8): a pointer to character data
* @max_len: max bytes to validate, or -1 to go until NUL
- * @end: (allow-none) (out) (transfer none): return location for end of valid data
+ * @end: (out) (optional) (transfer none): return location for end of valid data
*
* Validates UTF-8 encoded text. @str is the text to validate;
* if @str is nul-terminated, then @max_len can be -1, otherwise
diff --git a/glib/gvariant-parser.c b/glib/gvariant-parser.c
index b99ac4f..3741acb 100644
--- a/glib/gvariant-parser.c
+++ b/glib/gvariant-parser.c
@@ -2320,11 +2320,11 @@ parse (TokenStream *stream,
/**
* g_variant_parse:
- * @type: (allow-none): a #GVariantType, or %NULL
+ * @type: (nullable): a #GVariantType, or %NULL
* @text: a string containing a GVariant in text form
- * @limit: (allow-none): a pointer to the end of @text, or %NULL
- * @endptr: (allow-none): a location to store the end pointer, or %NULL
- * @error: (allow-none): a pointer to a %NULL #GError pointer, or %NULL
+ * @limit: (nullable): a pointer to the end of @text, or %NULL
+ * @endptr: (nullable): a location to store the end pointer, or %NULL
+ * @error: (nullable): a pointer to a %NULL #GError pointer, or %NULL
*
* Parses a #GVariant from a text representation.
*
diff --git a/glib/gvariant-serialiser.c b/glib/gvariant-serialiser.c
index 5df7fc3..5643cc1 100644
--- a/glib/gvariant-serialiser.c
+++ b/glib/gvariant-serialiser.c
@@ -87,7 +87,7 @@
/* < private >
* GVariantSerialised:
* @type_info: the #GVariantTypeInfo of this value
- * @data: (allow-none): the serialised data of this value, or %NULL
+ * @data: (nullable): the serialised data of this value, or %NULL
* @size: the size of this value
*
* A structure representing a GVariant in serialised form. This
diff --git a/glib/gvariant.c b/glib/gvariant.c
index 5b843fc..b0edcb7 100644
--- a/glib/gvariant.c
+++ b/glib/gvariant.c
@@ -620,8 +620,8 @@ NUMERIC_TYPE (DOUBLE, double, gdouble)
/* Container type Constructor / Deconstructors {{{1 */
/**
* g_variant_new_maybe:
- * @child_type: (allow-none): the #GVariantType of the child, or %NULL
- * @child: (allow-none): the child value, or %NULL
+ * @child_type: (nullable): the #GVariantType of the child, or %NULL
+ * @child: (nullable): the child value, or %NULL
*
* Depending on if @child is %NULL, either wraps @child inside of a
* maybe container or creates a Nothing instance for the given @type.
@@ -683,7 +683,7 @@ g_variant_new_maybe (const GVariantType *child_type,
* Given a maybe-typed #GVariant instance, extract its value. If the
* value is Nothing, then this function returns %NULL.
*
- * Returns: (allow-none) (transfer full): the contents of @value, or %NULL
+ * Returns: (nullable) (transfer full): the contents of @value, or %NULL
*
* Since: 2.24
**/
@@ -745,8 +745,8 @@ g_variant_get_variant (GVariant *value)
/**
* g_variant_new_array:
- * @child_type: (allow-none): the element type of the new array
- * @children: (allow-none) (array length=n_children): an array of
+ * @child_type: (nullable): the element type of the new array
+ * @children: (nullable) (array length=n_children): an array of
* #GVariant pointers, the children
* @n_children: the length of @children
*
@@ -996,7 +996,7 @@ g_variant_lookup (GVariant *dictionary,
* g_variant_lookup_value:
* @dictionary: a dictionary #GVariant
* @key: the key to lookup in the dictionary
- * @expected_type: (allow-none): a #GVariantType, or %NULL
+ * @expected_type: (nullable): a #GVariantType, or %NULL
*
* Looks up a value in a dictionary #GVariant.
*
@@ -1429,7 +1429,7 @@ g_variant_is_signature (const gchar *string)
/**
* g_variant_get_string:
* @value: a string #GVariant instance
- * @length: (allow-none) (default 0) (out): a pointer to a #gsize,
+ * @length: (optional) (default 0) (out): a pointer to a #gsize,
* to store the length
*
* Returns the string value of a #GVariant instance with a string
@@ -1566,7 +1566,7 @@ g_variant_new_strv (const gchar * const *strv,
/**
* g_variant_get_strv:
* @value: an array of strings #GVariant
- * @length: (out) (allow-none): the length of the result, or %NULL
+ * @length: (out) (optional): the length of the result, or %NULL
*
* Gets the contents of an array of strings #GVariant. This call
* makes a shallow copy; the return result should be released with
@@ -1616,7 +1616,7 @@ g_variant_get_strv (GVariant *value,
/**
* g_variant_dup_strv:
* @value: an array of strings #GVariant
- * @length: (out) (allow-none): the length of the result, or %NULL
+ * @length: (out) (optional): the length of the result, or %NULL
*
* Gets the contents of an array of strings #GVariant. This call
* makes a deep copy; the return result should be released with
@@ -1702,7 +1702,7 @@ g_variant_new_objv (const gchar * const *strv,
/**
* g_variant_get_objv:
* @value: an array of object paths #GVariant
- * @length: (out) (allow-none): the length of the result, or %NULL
+ * @length: (out) (optional): the length of the result, or %NULL
*
* Gets the contents of an array of object paths #GVariant. This call
* makes a shallow copy; the return result should be released with
@@ -1752,7 +1752,7 @@ g_variant_get_objv (GVariant *value,
/**
* g_variant_dup_objv:
* @value: an array of object paths #GVariant
- * @length: (out) (allow-none): the length of the result, or %NULL
+ * @length: (out) (optional): the length of the result, or %NULL
*
* Gets the contents of an array of object paths #GVariant. This call
* makes a deep copy; the return result should be released with
@@ -1873,7 +1873,7 @@ g_variant_get_bytestring (GVariant *value)
/**
* g_variant_dup_bytestring:
* @value: an array-of-bytes #GVariant instance
- * @length: (out) (allow-none) (default NULL): a pointer to a #gsize, to store
+ * @length: (out) (optional) (default NULL): a pointer to a #gsize, to store
* the length (not including the nul terminator)
*
* Similar to g_variant_get_bytestring() except that instead of
@@ -1942,7 +1942,7 @@ g_variant_new_bytestring_array (const gchar * const *strv,
/**
* g_variant_get_bytestring_array:
* @value: an array of array of bytes #GVariant ('aay')
- * @length: (out) (allow-none): the length of the result, or %NULL
+ * @length: (out) (optional): the length of the result, or %NULL
*
* Gets the contents of an array of array of bytes #GVariant. This call
* makes a shallow copy; the return result should be released with
@@ -1992,7 +1992,7 @@ g_variant_get_bytestring_array (GVariant *value,
/**
* g_variant_dup_bytestring_array:
* @value: an array of array of bytes #GVariant ('aay')
- * @length: (out) (allow-none): the length of the result, or %NULL
+ * @length: (out) (optional): the length of the result, or %NULL
*
* Gets the contents of an array of array of bytes #GVariant. This call
* makes a deep copy; the return result should be released with
@@ -2176,7 +2176,7 @@ g_variant_classify (GVariant *value)
/**
* g_variant_print_string: (skip)
* @value: a #GVariant
- * @string: (allow-none) (default NULL): a #GString, or %NULL
+ * @string: (nullable) (default NULL): a #GString, or %NULL
* @type_annotate: %TRUE if type information should be included in
* the output
*
@@ -3088,7 +3088,7 @@ g_variant_iter_free (GVariantIter *iter)
* }
* ]|
*
- * Returns: (allow-none) (transfer full): a #GVariant, or %NULL
+ * Returns: (nullable) (transfer full): a #GVariant, or %NULL
*
* Since: 2.24
**/
@@ -3833,7 +3833,7 @@ ensure_valid_dict (GVariantDict *dict)
/**
* g_variant_dict_new:
- * @from_asv: (allow-none): the #GVariant with which to initialise the
+ * @from_asv: (nullable): the #GVariant with which to initialise the
* dictionary
*
* Allocates and initialises a new #GVariantDict.
@@ -3867,7 +3867,7 @@ g_variant_dict_new (GVariant *from_asv)
/**
* g_variant_dict_init: (skip)
* @dict: a #GVariantDict
- * @from_asv: (allow-none): the initial value for @dict
+ * @from_asv: (nullable): the initial value for @dict
*
* Initialises a #GVariantDict structure.
*
@@ -3958,7 +3958,7 @@ g_variant_dict_lookup (GVariantDict *dict,
* g_variant_dict_lookup_value:
* @dict: a #GVariantDict
* @key: the key to lookup in the dictionary
- * @expected_type: (allow-none): a #GVariantType, or %NULL
+ * @expected_type: (nullable): a #GVariantType, or %NULL
*
* Looks up a value in a #GVariantDict.
*
@@ -4217,9 +4217,9 @@ g_variant_dict_unref (GVariantDict *dict)
/*< private >
* g_variant_format_string_scan:
* @string: a string that may be prefixed with a format string
- * @limit: (allow-none) (default NULL): a pointer to the end of @string,
+ * @limit: (nullable) (default NULL): a pointer to the end of @string,
* or %NULL
- * @endptr: (allow-none) (default NULL): location to store the end pointer,
+ * @endptr: (nullable) (default NULL): location to store the end pointer,
* or %NULL
*
* Checks the string pointed to by @string for starting with a properly
@@ -4468,9 +4468,9 @@ g_variant_check_format_string (GVariant *value,
/*< private >
* g_variant_format_string_scan_type:
* @string: a string that may be prefixed with a format string
- * @limit: (allow-none) (default NULL): a pointer to the end of @string,
+ * @limit: (nullable) (default NULL): a pointer to the end of @string,
* or %NULL
- * @endptr: (allow-none) (default NULL): location to store the end pointer,
+ * @endptr: (nullable) (default NULL): location to store the end pointer,
* or %NULL
*
* If @string starts with a valid format string then this function will
@@ -4483,7 +4483,7 @@ g_variant_check_format_string (GVariant *value,
* This function is otherwise exactly like
* g_variant_format_string_scan().
*
- * Returns: (allow-none): a #GVariantType if there was a valid format string
+ * Returns: (nullable): a #GVariantType if there was a valid format string
*
* Since: 2.24
*/
@@ -5284,7 +5284,7 @@ g_variant_new (const gchar *format_string,
/**
* g_variant_new_va: (skip)
* @format_string: a string that is prefixed with a format string
- * @endptr: (allow-none) (default NULL): location to store the end pointer,
+ * @endptr: (nullable) (default NULL): location to store the end pointer,
* or %NULL
* @app: a pointer to a #va_list
*
@@ -5395,7 +5395,7 @@ g_variant_get (GVariant *value,
* g_variant_get_va: (skip)
* @value: a #GVariant
* @format_string: a string that is prefixed with a format string
- * @endptr: (allow-none) (default NULL): location to store the end pointer,
+ * @endptr: (nullable) (default NULL): location to store the end pointer,
* or %NULL
* @app: a pointer to a #va_list
*
diff --git a/glib/gvarianttype.c b/glib/gvarianttype.c
index b3e227a..b8d6faa 100644
--- a/glib/gvarianttype.c
+++ b/glib/gvarianttype.c
@@ -197,8 +197,8 @@ g_variant_type_check (const GVariantType *type)
/**
* g_variant_type_string_scan:
* @string: a pointer to any string
- * @limit: (allow-none): the end of @string, or %NULL
- * @endptr: (out) (allow-none): location to store the end pointer, or %NULL
+ * @limit: (nullable): the end of @string, or %NULL
+ * @endptr: (out) (optional): location to store the end pointer, or %NULL
*
* Scan for a single complete and valid GVariant type string in @string.
* The memory pointed to by @limit (or bytes beyond it) is never
@@ -292,7 +292,7 @@ g_variant_type_string_is_valid (const gchar *type_string)
/**
* g_variant_type_free:
- * @type: (allow-none): a #GVariantType, or %NULL
+ * @type: (nullable): a #GVariantType, or %NULL
*
* Frees a #GVariantType that was allocated with
* g_variant_type_copy(), g_variant_type_new() or one of the container
diff --git a/glib/gvarianttypeinfo.c b/glib/gvarianttypeinfo.c
index b398d65..e10a304 100644
--- a/glib/gvarianttypeinfo.c
+++ b/glib/gvarianttypeinfo.c
@@ -220,8 +220,8 @@ g_variant_type_info_get_type_string (GVariantTypeInfo *info)
/* < private >
* g_variant_type_info_query:
* @info: a #GVariantTypeInfo
- * @alignment: (allow-none): the location to store the alignment, or %NULL
- * @fixed_size: (allow-none): the location to store the fixed size, or %NULL
+ * @alignment: (nullable): the location to store the alignment, or %NULL
+ * @fixed_size: (nullable): the location to store the fixed size, or %NULL
*
* Queries @info to determine the alignment requirements and fixed size
* (if any) of the type.
@@ -304,8 +304,8 @@ g_variant_type_info_element (GVariantTypeInfo *info)
/* < private >
* g_variant_type_query_element:
* @info: a #GVariantTypeInfo for an array or maybe type
- * @alignment: (allow-none): the location to store the alignment, or %NULL
- * @fixed_size: (allow-none): the location to store the fixed size, or %NULL
+ * @alignment: (nullable): the location to store the alignment, or %NULL
+ * @fixed_size: (nullable): the location to store the fixed size, or %NULL
*
* Returns the alignment requires and fixed size (if any) for the
* element type of the array. This call is a convenience wrapper around
diff --git a/glib/gwin32.c b/glib/gwin32.c
index e9081cc..81aab00 100644
--- a/glib/gwin32.c
+++ b/glib/gwin32.c
@@ -218,7 +218,7 @@ g_win32_error_message (gint error)
/**
* g_win32_get_package_installation_directory_of_module:
- * @hmodule: (allow-none): The Win32 handle for a DLL loaded into the current process, or %NULL
+ * @hmodule: (nullable): The Win32 handle for a DLL loaded into the current process, or %NULL
*
* This function tries to determine the installation directory of a
* software package based on the location of a DLL of the software
@@ -358,8 +358,8 @@ get_package_directory_from_module (const gchar *module_name)
/**
* g_win32_get_package_installation_directory:
- * @package: (allow-none): You should pass %NULL for this.
- * @dll_name: (allow-none): The name of a DLL that a package provides in UTF-8, or %NULL.
+ * @package: (nullable): You should pass %NULL for this.
+ * @dll_name: (nullable): The name of a DLL that a package provides in UTF-8, or %NULL.
*
* Try to determine the installation directory for a software package.
*
@@ -464,8 +464,8 @@ g_win32_get_package_installation_directory (const gchar *package,
/**
* g_win32_get_package_installation_subdirectory:
- * @package: (allow-none): You should pass %NULL for this.
- * @dll_name: (allow-none): The name of a DLL that a package provides, in UTF-8, or %NULL.
+ * @package: (nullable): You should pass %NULL for this.
+ * @dll_name: (nullable): The name of a DLL that a package provides, in UTF-8, or %NULL.
* @subdir: A subdirectory of the package installation directory, also in UTF-8
*
* This function is deprecated. Use
diff --git a/gmodule/gmodule.c b/gmodule/gmodule.c
index bf1eac7..f02dbbc 100644
--- a/gmodule/gmodule.c
+++ b/gmodule/gmodule.c
@@ -670,7 +670,7 @@ g_module_open (const gchar *file_name,
/**
* g_module_open:
- * @file_name: (allow-none): the name of the file containing the module, or %NULL
+ * @file_name: (nullable): the name of the file containing the module, or %NULL
* to obtain a #GModule representing the main program itself
* @flags: the flags used for opening the module. This can be the
* logical OR of any of the #GModuleFlags
@@ -891,7 +891,7 @@ g_module_name (GModule *module)
/**
* g_module_build_path:
- * @directory: (allow-none): the directory where the module is. This can be
+ * @directory: (nullable): the directory where the module is. This can be
* %NULL or the empty string to indicate that the standard platform-specific
* directories will be used, though that is not recommended
* @module_name: the name of the module
diff --git a/gobject/gbinding.c b/gobject/gbinding.c
index 01f00a1..31c3418 100644
--- a/gobject/gbinding.c
+++ b/gobject/gbinding.c
@@ -775,9 +775,9 @@ g_binding_unbind (GBinding *binding)
* @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
diff --git a/gobject/gboxed.c b/gobject/gboxed.c
index 40723f5..a901043 100644
--- a/gobject/gboxed.c
+++ b/gobject/gboxed.c
@@ -479,7 +479,7 @@ value_set_boxed_internal (GValue *value,
/**
* g_value_set_boxed:
* @value: a valid #GValue of %G_TYPE_BOXED derived type
- * @v_boxed: (allow-none): boxed value to be set
+ * @v_boxed: (nullable): boxed value to be set
*
* Set the contents of a %G_TYPE_BOXED derived #GValue to @v_boxed.
*/
@@ -496,7 +496,7 @@ g_value_set_boxed (GValue *value,
/**
* g_value_set_static_boxed:
* @value: a valid #GValue of %G_TYPE_BOXED derived type
- * @v_boxed: (allow-none): static boxed value to be set
+ * @v_boxed: (nullable): static boxed value to be set
*
* Set the contents of a %G_TYPE_BOXED derived #GValue to @v_boxed.
* The boxed value is assumed to be static, and is thus not duplicated
@@ -515,7 +515,7 @@ g_value_set_static_boxed (GValue *value,
/**
* g_value_set_boxed_take_ownership:
* @value: a valid #GValue of %G_TYPE_BOXED derived type
- * @v_boxed: (allow-none): duplicated unowned boxed value to be set
+ * @v_boxed: (nullable): duplicated unowned boxed value to be set
*
* This is an internal function introduced mainly for C marshallers.
*
@@ -531,7 +531,7 @@ g_value_set_boxed_take_ownership (GValue *value,
/**
* g_value_take_boxed:
* @value: a valid #GValue of %G_TYPE_BOXED derived type
- * @v_boxed: (allow-none): duplicated unowned boxed value to be set
+ * @v_boxed: (nullable): duplicated unowned boxed value to be set
*
* Sets the contents of a %G_TYPE_BOXED derived #GValue to @v_boxed
* and takes over the ownership of the callers reference to @v_boxed;
diff --git a/gobject/gclosure.c b/gobject/gclosure.c
index 8152424..cced5f9 100644
--- a/gobject/gclosure.c
+++ b/gobject/gclosure.c
@@ -762,7 +762,7 @@ g_closure_remove_finalize_notifier (GClosure *closure,
* @param_values: (array length=n_param_values): an array of
* #GValues holding the arguments on which to
* invoke the callback of @closure
- * @invocation_hint: (allow-none): a context-dependent invocation hint
+ * @invocation_hint: (nullable): a context-dependent invocation hint
*
* Invokes the closure, i.e. executes the callback represented by the @closure.
*/
@@ -1496,13 +1496,13 @@ g_cclosure_marshal_generic (GClosure *closure,
/**
* g_cclosure_marshal_generic_va:
* @closure: the #GClosure to which the marshaller belongs
- * @return_value: (allow-none): a #GValue to store the return
+ * @return_value: (nullable): a #GValue to store the return
* value. May be %NULL if the callback of @closure doesn't return a
* value.
* @instance: (type GObject.TypeInstance): the instance on which the closure is
* invoked.
* @args_list: va_list of arguments to be passed to the closure.
- * @marshal_data: (allow-none): additional data specified when
+ * @marshal_data: (nullable): additional data specified when
* registering the marshaller, see g_closure_set_marshal() and
* g_closure_set_meta_marshal()
* @n_params: the length of the @param_types array
diff --git a/gobject/gclosure.h b/gobject/gclosure.h
index 3195809..04ebeaf 100644
--- a/gobject/gclosure.h
+++ b/gobject/gclosure.h
@@ -97,16 +97,16 @@ typedef void (*GClosureNotify) (gpointer data,
/**
* GClosureMarshal:
* @closure: the #GClosure to which the marshaller belongs
- * @return_value: (allow-none): a #GValue to store the return
+ * @return_value: (nullable): a #GValue to store the return
* value. May be %NULL if the callback of @closure doesn't return a
* value.
* @n_param_values: the length of the @param_values array
* @param_values: (array length=n_param_values): an array of
* #GValues holding the arguments on which to invoke the
* callback of @closure
- * @invocation_hint: (allow-none): the invocation hint given as the
+ * @invocation_hint: (nullable): the invocation hint given as the
* last argument to g_closure_invoke()
- * @marshal_data: (allow-none): additional data specified when
+ * @marshal_data: (nullable): additional data specified when
* registering the marshaller, see g_closure_set_marshal() and
* g_closure_set_meta_marshal()
*
@@ -122,13 +122,13 @@ typedef void (*GClosureMarshal) (GClosure *closure,
/**
* GVaClosureMarshal:
* @closure: the #GClosure to which the marshaller belongs
- * @return_value: (allow-none): a #GValue to store the return
+ * @return_value: (nullable): a #GValue to store the return
* value. May be %NULL if the callback of @closure doesn't return a
* value.
* @instance: (type GObject.TypeInstance): the instance on which the closure is
* invoked.
* @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (allow-none): additional data specified when
+ * @marshal_data: (nullable): additional data specified when
* registering the marshaller, see g_closure_set_marshal() and
* g_closure_set_meta_marshal()
* @n_params: the length of the @param_types array
diff --git a/gobject/gmarshal.c b/gobject/gmarshal.c
index f270f2e..0bb2da5 100644
--- a/gobject/gmarshal.c
+++ b/gobject/gmarshal.c
@@ -423,12 +423,12 @@
/**
* g_cclosure_marshal_VOID__VOIDv:
* @closure: the #GClosure to which the marshaller belongs
- * @return_value: (allow-none): a #GValue to store the return
+ * @return_value: (nullable): a #GValue to store the return
* value. May be %NULL if the callback of @closure doesn't return a
* value.
* @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
* @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (allow-none): additional data specified when
+ * @marshal_data: (nullable): additional data specified when
* registering the marshaller, see g_closure_set_marshal() and
* g_closure_set_meta_marshal()
* @n_params: the length of the @param_types array
@@ -441,12 +441,12 @@
/**
* g_cclosure_marshal_VOID__BOOLEANv:
* @closure: the #GClosure to which the marshaller belongs
- * @return_value: (allow-none): a #GValue to store the return
+ * @return_value: (nullable): a #GValue to store the return
* value. May be %NULL if the callback of @closure doesn't return a
* value.
* @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
* @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (allow-none): additional data specified when
+ * @marshal_data: (nullable): additional data specified when
* registering the marshaller, see g_closure_set_marshal() and
* g_closure_set_meta_marshal()
* @n_params: the length of the @param_types array
@@ -458,12 +458,12 @@
/**
* g_cclosure_marshal_VOID__CHARv:
* @closure: the #GClosure to which the marshaller belongs
- * @return_value: (allow-none): a #GValue to store the return
+ * @return_value: (nullable): a #GValue to store the return
* value. May be %NULL if the callback of @closure doesn't return a
* value.
* @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
* @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (allow-none): additional data specified when
+ * @marshal_data: (nullable): additional data specified when
* registering the marshaller, see g_closure_set_marshal() and
* g_closure_set_meta_marshal()
* @n_params: the length of the @param_types array
@@ -475,12 +475,12 @@
/**
* g_cclosure_marshal_VOID__UCHARv:
* @closure: the #GClosure to which the marshaller belongs
- * @return_value: (allow-none): a #GValue to store the return
+ * @return_value: (nullable): a #GValue to store the return
* value. May be %NULL if the callback of @closure doesn't return a
* value.
* @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
* @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (allow-none): additional data specified when
+ * @marshal_data: (nullable): additional data specified when
* registering the marshaller, see g_closure_set_marshal() and
* g_closure_set_meta_marshal()
* @n_params: the length of the @param_types array
@@ -492,12 +492,12 @@
/**
* g_cclosure_marshal_VOID__INTv:
* @closure: the #GClosure to which the marshaller belongs
- * @return_value: (allow-none): a #GValue to store the return
+ * @return_value: (nullable): a #GValue to store the return
* value. May be %NULL if the callback of @closure doesn't return a
* value.
* @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
* @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (allow-none): additional data specified when
+ * @marshal_data: (nullable): additional data specified when
* registering the marshaller, see g_closure_set_marshal() and
* g_closure_set_meta_marshal()
* @n_params: the length of the @param_types array
@@ -509,12 +509,12 @@
/**
* g_cclosure_marshal_VOID__UINTv:
* @closure: the #GClosure to which the marshaller belongs
- * @return_value: (allow-none): a #GValue to store the return
+ * @return_value: (nullable): a #GValue to store the return
* value. May be %NULL if the callback of @closure doesn't return a
* value.
* @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
* @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (allow-none): additional data specified when
+ * @marshal_data: (nullable): additional data specified when
* registering the marshaller, see g_closure_set_marshal() and
* g_closure_set_meta_marshal()
* @n_params: the length of the @param_types array
@@ -526,12 +526,12 @@
/**
* g_cclosure_marshal_VOID__LONGv:
* @closure: the #GClosure to which the marshaller belongs
- * @return_value: (allow-none): a #GValue to store the return
+ * @return_value: (nullable): a #GValue to store the return
* value. May be %NULL if the callback of @closure doesn't return a
* value.
* @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
* @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (allow-none): additional data specified when
+ * @marshal_data: (nullable): additional data specified when
* registering the marshaller, see g_closure_set_marshal() and
* g_closure_set_meta_marshal()
* @n_params: the length of the @param_types array
@@ -543,12 +543,12 @@
/**
* g_cclosure_marshal_VOID__ULONGv:
* @closure: the #GClosure to which the marshaller belongs
- * @return_value: (allow-none): a #GValue to store the return
+ * @return_value: (nullable): a #GValue to store the return
* value. May be %NULL if the callback of @closure doesn't return a
* value.
* @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
* @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (allow-none): additional data specified when
+ * @marshal_data: (nullable): additional data specified when
* registering the marshaller, see g_closure_set_marshal() and
* g_closure_set_meta_marshal()
* @n_params: the length of the @param_types array
@@ -560,12 +560,12 @@
/**
* g_cclosure_marshal_VOID__ENUMv:
* @closure: the #GClosure to which the marshaller belongs
- * @return_value: (allow-none): a #GValue to store the return
+ * @return_value: (nullable): a #GValue to store the return
* value. May be %NULL if the callback of @closure doesn't return a
* value.
* @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
* @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (allow-none): additional data specified when
+ * @marshal_data: (nullable): additional data specified when
* registering the marshaller, see g_closure_set_marshal() and
* g_closure_set_meta_marshal()
* @n_params: the length of the @param_types array
@@ -577,12 +577,12 @@
/**
* g_cclosure_marshal_VOID__FLAGSv:
* @closure: the #GClosure to which the marshaller belongs
- * @return_value: (allow-none): a #GValue to store the return
+ * @return_value: (nullable): a #GValue to store the return
* value. May be %NULL if the callback of @closure doesn't return a
* value.
* @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
* @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (allow-none): additional data specified when
+ * @marshal_data: (nullable): additional data specified when
* registering the marshaller, see g_closure_set_marshal() and
* g_closure_set_meta_marshal()
* @n_params: the length of the @param_types array
@@ -594,12 +594,12 @@
/**
* g_cclosure_marshal_VOID__FLOATv:
* @closure: the #GClosure to which the marshaller belongs
- * @return_value: (allow-none): a #GValue to store the return
+ * @return_value: (nullable): a #GValue to store the return
* value. May be %NULL if the callback of @closure doesn't return a
* value.
* @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
* @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (allow-none): additional data specified when
+ * @marshal_data: (nullable): additional data specified when
* registering the marshaller, see g_closure_set_marshal() and
* g_closure_set_meta_marshal()
* @n_params: the length of the @param_types array
@@ -611,12 +611,12 @@
/**
* g_cclosure_marshal_VOID__DOUBLEv:
* @closure: the #GClosure to which the marshaller belongs
- * @return_value: (allow-none): a #GValue to store the return
+ * @return_value: (nullable): a #GValue to store the return
* value. May be %NULL if the callback of @closure doesn't return a
* value.
* @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
* @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (allow-none): additional data specified when
+ * @marshal_data: (nullable): additional data specified when
* registering the marshaller, see g_closure_set_marshal() and
* g_closure_set_meta_marshal()
* @n_params: the length of the @param_types array
@@ -628,12 +628,12 @@
/**
* g_cclosure_marshal_VOID__STRINGv:
* @closure: the #GClosure to which the marshaller belongs
- * @return_value: (allow-none): a #GValue to store the return
+ * @return_value: (nullable): a #GValue to store the return
* value. May be %NULL if the callback of @closure doesn't return a
* value.
* @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
* @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (allow-none): additional data specified when
+ * @marshal_data: (nullable): additional data specified when
* registering the marshaller, see g_closure_set_marshal() and
* g_closure_set_meta_marshal()
* @n_params: the length of the @param_types array
@@ -645,12 +645,12 @@
/**
* g_cclosure_marshal_VOID__PARAMv:
* @closure: the #GClosure to which the marshaller belongs
- * @return_value: (allow-none): a #GValue to store the return
+ * @return_value: (nullable): a #GValue to store the return
* value. May be %NULL if the callback of @closure doesn't return a
* value.
* @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
* @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (allow-none): additional data specified when
+ * @marshal_data: (nullable): additional data specified when
* registering the marshaller, see g_closure_set_marshal() and
* g_closure_set_meta_marshal()
* @n_params: the length of the @param_types array
@@ -662,12 +662,12 @@
/**
* g_cclosure_marshal_VOID__BOXEDv:
* @closure: the #GClosure to which the marshaller belongs
- * @return_value: (allow-none): a #GValue to store the return
+ * @return_value: (nullable): a #GValue to store the return
* value. May be %NULL if the callback of @closure doesn't return a
* value.
* @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
* @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (allow-none): additional data specified when
+ * @marshal_data: (nullable): additional data specified when
* registering the marshaller, see g_closure_set_marshal() and
* g_closure_set_meta_marshal()
* @n_params: the length of the @param_types array
@@ -679,12 +679,12 @@
/**
* g_cclosure_marshal_VOID__POINTERv:
* @closure: the #GClosure to which the marshaller belongs
- * @return_value: (allow-none): a #GValue to store the return
+ * @return_value: (nullable): a #GValue to store the return
* value. May be %NULL if the callback of @closure doesn't return a
* value.
* @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
* @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (allow-none): additional data specified when
+ * @marshal_data: (nullable): additional data specified when
* registering the marshaller, see g_closure_set_marshal() and
* g_closure_set_meta_marshal()
* @n_params: the length of the @param_types array
@@ -696,12 +696,12 @@
/**
* g_cclosure_marshal_VOID__OBJECTv:
* @closure: the #GClosure to which the marshaller belongs
- * @return_value: (allow-none): a #GValue to store the return
+ * @return_value: (nullable): a #GValue to store the return
* value. May be %NULL if the callback of @closure doesn't return a
* value.
* @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
* @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (allow-none): additional data specified when
+ * @marshal_data: (nullable): additional data specified when
* registering the marshaller, see g_closure_set_marshal() and
* g_closure_set_meta_marshal()
* @n_params: the length of the @param_types array
@@ -713,12 +713,12 @@
/**
* g_cclosure_marshal_VOID__VARIANTv:
* @closure: the #GClosure to which the marshaller belongs
- * @return_value: (allow-none): a #GValue to store the return
+ * @return_value: (nullable): a #GValue to store the return
* value. May be %NULL if the callback of @closure doesn't return a
* value.
* @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
* @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (allow-none): additional data specified when
+ * @marshal_data: (nullable): additional data specified when
* registering the marshaller, see g_closure_set_marshal() and
* g_closure_set_meta_marshal()
* @n_params: the length of the @param_types array
@@ -730,12 +730,12 @@
/**
* g_cclosure_marshal_STRING__OBJECT_POINTERv:
* @closure: the #GClosure to which the marshaller belongs
- * @return_value: (allow-none): a #GValue to store the return
+ * @return_value: (nullable): a #GValue to store the return
* value. May be %NULL if the callback of @closure doesn't return a
* value.
* @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
* @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (allow-none): additional data specified when
+ * @marshal_data: (nullable): additional data specified when
* registering the marshaller, see g_closure_set_marshal() and
* g_closure_set_meta_marshal()
* @n_params: the length of the @param_types array
@@ -747,12 +747,12 @@
/**
* g_cclosure_marshal_VOID__UINT_POINTERv:
* @closure: the #GClosure to which the marshaller belongs
- * @return_value: (allow-none): a #GValue to store the return
+ * @return_value: (nullable): a #GValue to store the return
* value. May be %NULL if the callback of @closure doesn't return a
* value.
* @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
* @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (allow-none): additional data specified when
+ * @marshal_data: (nullable): additional data specified when
* registering the marshaller, see g_closure_set_marshal() and
* g_closure_set_meta_marshal()
* @n_params: the length of the @param_types array
@@ -764,12 +764,12 @@
/**
* g_cclosure_marshal_BOOLEAN__FLAGSv:
* @closure: the #GClosure to which the marshaller belongs
- * @return_value: (allow-none): a #GValue to store the return
+ * @return_value: (nullable): a #GValue to store the return
* value. May be %NULL if the callback of @closure doesn't return a
* value.
* @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
* @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (allow-none): additional data specified when
+ * @marshal_data: (nullable): additional data specified when
* registering the marshaller, see g_closure_set_marshal() and
* g_closure_set_meta_marshal()
* @n_params: the length of the @param_types array
@@ -781,12 +781,12 @@
/**
* g_cclosure_marshal_BOOLEAN__BOXED_BOXEDv:
* @closure: the #GClosure to which the marshaller belongs
- * @return_value: (allow-none): a #GValue to store the return
+ * @return_value: (nullable): a #GValue to store the return
* value. May be %NULL if the callback of @closure doesn't return a
* value.
* @instance: (type GObject.TypeInstance): the instance on which the closure is invoked.
* @args: va_list of arguments to be passed to the closure.
- * @marshal_data: (allow-none): additional data specified when
+ * @marshal_data: (nullable): additional data specified when
* registering the marshaller, see g_closure_set_marshal() and
* g_closure_set_meta_marshal()
* @n_params: the length of the @param_types array
diff --git a/gobject/gobject.c b/gobject/gobject.c
index 766d039..d04f89c 100644
--- a/gobject/gobject.c
+++ b/gobject/gobject.c
@@ -2733,7 +2733,7 @@ g_object_weak_unref (GObject *object,
/**
* g_object_add_weak_pointer: (skip)
* @object: The object that should be weak referenced.
- * @weak_pointer_location: (inout) (not optional) (nullable): The memory address
+ * @weak_pointer_location: (inout) (not optional): The memory address
* of a pointer.
*
* Adds a weak reference from weak_pointer to @object to indicate that
@@ -2761,7 +2761,7 @@ g_object_add_weak_pointer (GObject *object,
/**
* g_object_remove_weak_pointer: (skip)
* @object: The object that is weak referenced.
- * @weak_pointer_location: (inout) (not optional) (nullable): The memory address
+ * @weak_pointer_location: (inout) (not optional): The memory address
* of a pointer.
*
* Removes a weak reference from @object that was previously added
@@ -3271,8 +3271,8 @@ g_object_set_qdata (GObject *object,
* g_object_dup_qdata:
* @object: the #GObject to store user data on
* @quark: a #GQuark, naming the user data pointer
- * @dup_func: (allow-none): function to dup the value
- * @user_data: (allow-none): passed as user_data to @dup_func
+ * @dup_func: (nullable): function to dup the value
+ * @user_data: (nullable): passed as user_data to @dup_func
*
* This is a variant of g_object_get_qdata() which returns
* a 'duplicate' of the value. @dup_func defines the
@@ -3312,10 +3312,10 @@ g_object_dup_qdata (GObject *object,
* g_object_replace_qdata:
* @object: the #GObject to store user data on
* @quark: a #GQuark, naming the user data pointer
- * @oldval: (allow-none): the old value to compare against
- * @newval: (allow-none): the new value
- * @destroy: (allow-none): a destroy notify for the new value
- * @old_destroy: (allow-none): destroy notify for the existing value
+ * @oldval: (nullable): the old value to compare against
+ * @newval: (nullable): the new value
+ * @destroy: (nullable): a destroy notify for the new value
+ * @old_destroy: (nullable): destroy notify for the existing value
*
* Compares the user data for the key @quark on @object with
* @oldval, and if they are the same, replaces @oldval with
@@ -3478,8 +3478,8 @@ g_object_set_data (GObject *object,
* g_object_dup_data:
* @object: the #GObject to store user data on
* @key: a string, naming the user data pointer
- * @dup_func: (allow-none): function to dup the value
- * @user_data: (allow-none): passed as user_data to @dup_func
+ * @dup_func: (nullable): function to dup the value
+ * @user_data: (nullable): passed as user_data to @dup_func
*
* This is a variant of g_object_get_data() which returns
* a 'duplicate' of the value. @dup_func defines the
@@ -3521,10 +3521,10 @@ g_object_dup_data (GObject *object,
* g_object_replace_data:
* @object: the #GObject to store user data on
* @key: a string, naming the user data pointer
- * @oldval: (allow-none): the old value to compare against
- * @newval: (allow-none): the new value
- * @destroy: (allow-none): a destroy notify for the new value
- * @old_destroy: (allow-none): destroy notify for the existing value
+ * @oldval: (nullable): the old value to compare against
+ * @newval: (nullable): the new value
+ * @destroy: (nullable): a destroy notify for the new value
+ * @old_destroy: (nullable): destroy notify for the existing value
*
* Compares the user data for the key @key on @object with
* @oldval, and if they are the same, replaces @oldval with
@@ -3706,7 +3706,7 @@ g_value_object_lcopy_value (const GValue *value,
/**
* g_value_set_object:
* @value: a valid #GValue of %G_TYPE_OBJECT derived type
- * @v_object: (type GObject.Object) (allow-none): object value to be set
+ * @v_object: (type GObject.Object) (nullable): object value to be set
*
* Set the contents of a %G_TYPE_OBJECT derived #GValue to @v_object.
*
@@ -3748,7 +3748,7 @@ g_value_set_object (GValue *value,
/**
* g_value_set_object_take_ownership: (skip)
* @value: a valid #GValue of %G_TYPE_OBJECT derived type
- * @v_object: (allow-none): object value to be set
+ * @v_object: (nullable): object value to be set
*
* This is an internal function introduced mainly for C marshallers.
*
@@ -3764,7 +3764,7 @@ g_value_set_object_take_ownership (GValue *value,
/**
* g_value_take_object: (skip)
* @value: a valid #GValue of %G_TYPE_OBJECT derived type
- * @v_object: (allow-none): object value to be set
+ * @v_object: (nullable): object value to be set
*
* Sets the contents of a %G_TYPE_OBJECT derived #GValue to @v_object
* and takes over the ownership of the callers reference to @v_object;
diff --git a/gobject/gparam.c b/gobject/gparam.c
index 46c359b..472ea3d 100644
--- a/gobject/gparam.c
+++ b/gobject/gparam.c
@@ -1430,7 +1430,7 @@ g_param_type_register_static (const gchar *name,
/**
* g_value_set_param:
* @value: a valid #GValue of type %G_TYPE_PARAM
- * @param: (allow-none): the #GParamSpec to be set
+ * @param: (nullable): the #GParamSpec to be set
*
* Set the contents of a %G_TYPE_PARAM #GValue to @param.
*/
@@ -1452,7 +1452,7 @@ g_value_set_param (GValue *value,
/**
* g_value_set_param_take_ownership: (skip)
* @value: a valid #GValue of type %G_TYPE_PARAM
- * @param: (allow-none): the #GParamSpec to be set
+ * @param: (nullable): the #GParamSpec to be set
*
* This is an internal function introduced mainly for C marshallers.
*
@@ -1468,7 +1468,7 @@ g_value_set_param_take_ownership (GValue *value,
/**
* g_value_take_param: (skip)
* @value: a valid #GValue of type %G_TYPE_PARAM
- * @param: (allow-none): the #GParamSpec to be set
+ * @param: (nullable): the #GParamSpec to be set
*
* Sets the contents of a %G_TYPE_PARAM #GValue to @param and takes
* over the ownership of the callers reference to @param; the caller
diff --git a/gobject/gparamspecs.c b/gobject/gparamspecs.c
index 43fc383..9685ef4 100644
--- a/gobject/gparamspecs.c
+++ b/gobject/gparamspecs.c
@@ -2532,7 +2532,7 @@ g_param_spec_override (const gchar *name,
* @nick: nick name for the property specified
* @blurb: description of the property specified
* @type: a #GVariantType
- * @default_value: (allow-none) (transfer full): a #GVariant of type @type to
+ * @default_value: (nullable) (transfer full): a #GVariant of type @type to
* use as the default value, or %NULL
* @flags: flags for the property specified
*
diff --git a/gobject/gsignal.c b/gobject/gsignal.c
index 6cfefca..5ef29cd 100644
--- a/gobject/gsignal.c
+++ b/gobject/gsignal.c
@@ -1389,7 +1389,7 @@ g_signal_query (guint signal_id,
* not associate a class method slot with this signal.
* @accumulator: the accumulator for this signal; may be %NULL.
* @accu_data: user data for the @accumulator.
- * @c_marshaller: (allow-none): the function to translate arrays of parameter
+ * @c_marshaller: (nullable): the function to translate arrays of parameter
* values to signal emissions into C language callback invocations or %NULL.
* @return_type: the type of return value, or #G_TYPE_NONE for a signal
* without a return value.
@@ -1457,7 +1457,7 @@ g_signal_new (const gchar *signal_name,
* not associate a class method with this signal.
* @accumulator: the accumulator for this signal; may be %NULL.
* @accu_data: user data for the @accumulator.
- * @c_marshaller: (allow-none): the function to translate arrays of parameter
+ * @c_marshaller: (nullable): the function to translate arrays of parameter
* values to signal emissions into C language callback invocations or %NULL.
* @return_type: the type of return value, or #G_TYPE_NONE for a signal
* without a return value.
@@ -1590,11 +1590,11 @@ signal_add_class_closure (SignalNode *node,
* @signal_flags: a combination of #GSignalFlags specifying detail of when
* the default handler is to be invoked. You should at least specify
* %G_SIGNAL_RUN_FIRST or %G_SIGNAL_RUN_LAST
- * @class_closure: (allow-none): The closure to invoke on signal emission;
+ * @class_closure: (nullable): The closure to invoke on signal emission;
* may be %NULL
- * @accumulator: (allow-none): the accumulator for this signal; may be %NULL
+ * @accumulator: (nullable): the accumulator for this signal; may be %NULL
* @accu_data: user data for the @accumulator
- * @c_marshaller: (allow-none): the function to translate arrays of
+ * @c_marshaller: (nullable): the function to translate arrays of
* parameter values to signal emissions into C language callback
* invocations or %NULL
* @return_type: the type of return value, or #G_TYPE_NONE for a signal
@@ -1857,7 +1857,7 @@ g_signal_set_va_marshaller (guint signal_id,
* @class_closure: The closure to invoke on signal emission; may be %NULL.
* @accumulator: the accumulator for this signal; may be %NULL.
* @accu_data: user data for the @accumulator.
- * @c_marshaller: (allow-none): the function to translate arrays of parameter
+ * @c_marshaller: (nullable): the function to translate arrays of parameter
* values to signal emissions into C language callback invocations or %NULL.
* @return_type: the type of return value, or #G_TYPE_NONE for a signal
* without a return value.
@@ -2727,7 +2727,7 @@ g_signal_handlers_destroy (gpointer instance)
* and/or @data the handler has to match.
* @signal_id: Signal the handler has to be connected to.
* @detail: Signal detail the handler has to be connected to.
- * @closure: (allow-none): The closure the handler will invoke.
+ * @closure: (nullable): The closure the handler will invoke.
* @func: The C closure callback of the handler (useless for non-C closures).
* @data: The closure data of the handler's closure.
*
@@ -2807,7 +2807,7 @@ signal_handlers_foreach_matched_R (gpointer instance,
* and/or @data the handlers have to match.
* @signal_id: Signal the handlers have to be connected to.
* @detail: Signal detail the handlers have to be connected to.
- * @closure: (allow-none): The closure the handlers will invoke.
+ * @closure: (nullable): The closure the handlers will invoke.
* @func: The C closure callback of the handlers (useless for non-C closures).
* @data: The closure data of the handlers' closures.
*
@@ -2854,7 +2854,7 @@ g_signal_handlers_block_matched (gpointer instance,
* and/or @data the handlers have to match.
* @signal_id: Signal the handlers have to be connected to.
* @detail: Signal detail the handlers have to be connected to.
- * @closure: (allow-none): The closure the handlers will invoke.
+ * @closure: (nullable): The closure the handlers will invoke.
* @func: The C closure callback of the handlers (useless for non-C closures).
* @data: The closure data of the handlers' closures.
*
@@ -2902,7 +2902,7 @@ g_signal_handlers_unblock_matched (gpointer instance,
* and/or @data the handlers have to match.
* @signal_id: Signal the handlers have to be connected to.
* @detail: Signal detail the handlers have to be connected to.
- * @closure: (allow-none): The closure the handlers will invoke.
+ * @closure: (nullable): The closure the handlers will invoke.
* @func: The C closure callback of the handlers (useless for non-C closures).
* @data: The closure data of the handlers' closures.
*
diff --git a/gobject/gtype.c b/gobject/gtype.c
index 3fe2c01..48290ae 100644
--- a/gobject/gtype.c
+++ b/gobject/gtype.c
@@ -1632,7 +1632,7 @@ g_type_interface_add_prerequisite (GType interface_type,
/**
* g_type_interface_prerequisites:
* @interface_type: an interface type
- * @n_prerequisites: (out) (allow-none): location to return the number
+ * @n_prerequisites: (out) (optional): location to return the number
* of prerequisites, or %NULL
*
* Returns the prerequisites of an interfaces type.
@@ -3528,7 +3528,7 @@ g_type_is_a (GType type,
/**
* g_type_children:
* @type: the parent type
- * @n_children: (out) (allow-none): location to store the length of
+ * @n_children: (out) (optional): location to store the length of
* the returned array, or %NULL
*
* Return a newly allocated and 0-terminated array of type IDs, listing
@@ -3571,7 +3571,7 @@ g_type_children (GType type,
/**
* g_type_interfaces:
* @type: the type to list interface types for
- * @n_interfaces: (out) (allow-none): location to store the length of
+ * @n_interfaces: (out) (optional): location to store the length of
* the returned array, or %NULL
*
* Return a newly allocated and 0-terminated array of type IDs, listing
diff --git a/gobject/gvalue.c b/gobject/gvalue.c
index b39bacd..f82c80e 100644
--- a/gobject/gvalue.c
+++ b/gobject/gvalue.c
@@ -327,7 +327,7 @@ g_value_peek_pointer (const GValue *value)
/**
* g_value_set_instance:
* @value: An initialized #GValue structure.
- * @instance: (allow-none): the instance
+ * @instance: (nullable): the instance
*
* Sets @value from an instantiatable type via the
* value_table's collect_value() function.
diff --git a/gobject/gvaluearray.c b/gobject/gvaluearray.c
index b279acf..dccc852 100644
--- a/gobject/gvaluearray.c
+++ b/gobject/gvaluearray.c
@@ -210,7 +210,7 @@ g_value_array_copy (const GValueArray *value_array)
/**
* g_value_array_prepend:
* @value_array: #GValueArray to add an element to
- * @value: (allow-none): #GValue to copy into #GValueArray, or %NULL
+ * @value: (nullable): #GValue to copy into #GValueArray, or %NULL
*
* Insert a copy of @value as first element of @value_array. If @value is
* %NULL, an uninitialized value is prepended.
@@ -234,7 +234,7 @@ g_value_array_prepend (GValueArray *value_array,
/**
* g_value_array_append:
* @value_array: #GValueArray to add an element to
- * @value: (allow-none): #GValue to copy into #GValueArray, or %NULL
+ * @value: (nullable): #GValue to copy into #GValueArray, or %NULL
*
* Insert a copy of @value as last element of @value_array. If @value is
* %NULL, an uninitialized value is appended.
@@ -258,7 +258,7 @@ g_value_array_append (GValueArray *value_array,
* g_value_array_insert:
* @value_array: #GValueArray to add an element to
* @index_: insertion position, must be <= value_array->;n_values
- * @value: (allow-none): #GValue to copy into #GValueArray, or %NULL
+ * @value: (nullable): #GValue to copy into #GValueArray, or %NULL
*
* Insert a copy of @value at specified position into @value_array. If @value
* is %NULL, an uninitialized value is inserted.
diff --git a/gobject/gvaluetypes.c b/gobject/gvaluetypes.c
index fd452fa..d717975 100644
--- a/gobject/gvaluetypes.c
+++ b/gobject/gvaluetypes.c
@@ -1023,7 +1023,7 @@ g_value_get_double (const GValue *value)
/**
* g_value_set_string:
* @value: a valid #GValue of type %G_TYPE_STRING
- * @v_string: (allow-none): caller-owned string to be duplicated for the #GValue
+ * @v_string: (nullable): caller-owned string to be duplicated for the #GValue
*
* Set the contents of a %G_TYPE_STRING #GValue to @v_string.
*/
@@ -1048,7 +1048,7 @@ g_value_set_string (GValue *value,
/**
* g_value_set_static_string:
* @value: a valid #GValue of type %G_TYPE_STRING
- * @v_string: (allow-none): static string to be set
+ * @v_string: (nullable): static string to be set
*
* Set the contents of a %G_TYPE_STRING #GValue to @v_string.
* The string is assumed to be static, and is thus not duplicated
@@ -1069,7 +1069,7 @@ g_value_set_static_string (GValue *value,
/**
* g_value_set_string_take_ownership:
* @value: a valid #GValue of type %G_TYPE_STRING
- * @v_string: (allow-none): duplicated unowned string to be set
+ * @v_string: (nullable): duplicated unowned string to be set
*
* This is an internal function introduced mainly for C marshallers.
*
@@ -1085,7 +1085,7 @@ g_value_set_string_take_ownership (GValue *value,
/**
* g_value_take_string:
* @value: a valid #GValue of type %G_TYPE_STRING
- * @v_string: (allow-none): string to take ownership of
+ * @v_string: (nullable): string to take ownership of
*
* Sets the contents of a %G_TYPE_STRING #GValue to @v_string.
*
@@ -1210,7 +1210,7 @@ g_value_get_gtype (const GValue *value)
/**
* g_value_set_variant:
* @value: a valid #GValue of type %G_TYPE_VARIANT
- * @variant: (allow-none): a #GVariant, or %NULL
+ * @variant: (nullable): a #GVariant, or %NULL
*
* Set the contents of a variant #GValue to @variant.
* If the variant is floating, it is consumed.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
