summaryrefslogtreecommitdiff
path: root/gio
diff options
context:
space:
mode:
Diffstat (limited to 'gio')
-rw-r--r--gio/gactiongroup.c8
-rw-r--r--gio/gapplication.c4
-rw-r--r--gio/gapplicationcommandline.c2
-rw-r--r--gio/gasyncinitable.c2
-rw-r--r--gio/gcancellable.c8
-rw-r--r--gio/gdbusaddress.c6
-rw-r--r--gio/gdbusauthobserver.c4
-rw-r--r--gio/gdbusconnection.c40
-rw-r--r--gio/gdbuserror.c4
-rw-r--r--gio/gdbusinterface.c2
-rw-r--r--gio/gdbusintrospection.c2
-rw-r--r--gio/gdbusmessage.c6
-rw-r--r--gio/gdbusmethodinvocation.c4
-rw-r--r--gio/gdbusnameowning.c14
-rw-r--r--gio/gdbusnamewatching.c12
-rw-r--r--gio/gdbusobjectmanagerclient.c16
-rw-r--r--gio/gdbusproxy.c24
-rw-r--r--gio/gdbusserver.c2
-rw-r--r--gio/gfile.c24
-rw-r--r--gio/ginitable.c2
-rw-r--r--gio/gioscheduler.c6
-rw-r--r--gio/gmemoryoutputstream.c6
-rw-r--r--gio/gnetworkmonitor.c4
-rw-r--r--gio/gpermission.c8
-rw-r--r--gio/gsettingsbackend.c2
-rw-r--r--gio/gsimpleasyncresult.c2
-rw-r--r--gio/gsocket.c4
-rw-r--r--gio/gsocketclient.c2
-rw-r--r--gio/gtlsconnection.c4
-rw-r--r--gio/gvolume.c2
30 files changed, 113 insertions, 113 deletions
diff --git a/gio/gactiongroup.c b/gio/gactiongroup.c
index 73d1ca353..30e5e137d 100644
--- a/gio/gactiongroup.c
+++ b/gio/gactiongroup.c
@@ -699,10 +699,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): the parameter type, or %NULL if none needed
- * @state_type: (out): the state type, or %NULL if stateless
- * @state_hint: (out): the state hint, or %NULL if none
- * @state: (out): the current state, or %NULL if stateless
+ * @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
*
* Queries all aspects of the named action within an @action_group.
*
diff --git a/gio/gapplication.c b/gio/gapplication.c
index fe01d2a43..410f854d4 100644
--- a/gio/gapplication.c
+++ b/gio/gapplication.c
@@ -1135,7 +1135,7 @@ g_application_get_is_remote (GApplication *application)
/**
* g_application_register:
* @application: a #GApplication
- * @cancellable: a #GCancellable, or %NULL
+ * @cancellable: (allow-none): a #GCancellable, or %NULL
* @error: a pointer to a NULL #GError, or %NULL
*
* Attempts registration of the application.
@@ -1682,7 +1682,7 @@ g_application_get_default (void)
/**
* g_application_set_default:
- * @application: the application to set as default, or %NULL
+ * @application: (allow-none): the application to set as default, or %NULL
*
* Sets or unsets the default application for the process, as returned
* by g_application_get_default().
diff --git a/gio/gapplicationcommandline.c b/gio/gapplicationcommandline.c
index 773e5df99..c51f45d98 100644
--- a/gio/gapplicationcommandline.c
+++ b/gio/gapplicationcommandline.c
@@ -326,7 +326,7 @@ g_application_command_line_class_init (GApplicationCommandLineClass *class)
/**
* g_application_command_line_get_arguments:
* @cmdline: a #GApplicationCommandLine
- * @argc: (out): the length of the arguments array, or %NULL
+ * @argc: (out) (allow-none): 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 e2264e0f6..4d0c0978f 100644
--- a/gio/gasyncinitable.c
+++ b/gio/gasyncinitable.c
@@ -318,7 +318,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: the name of the first property, or %NULL if no
+ * @first_property_name: (allow-none): 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/gcancellable.c b/gio/gcancellable.c
index 06d2fa7d7..8fb119522 100644
--- a/gio/gcancellable.c
+++ b/gio/gcancellable.c
@@ -362,7 +362,7 @@ g_cancellable_get_fd (GCancellable *cancellable)
/**
* g_cancellable_make_pollfd:
- * @cancellable: a #GCancellable or %NULL
+ * @cancellable: (allow-none): a #GCancellable or %NULL
* @pollfd: a pointer to a #GPollFD
*
* Creates a #GPollFD corresponding to @cancellable; this can be passed
@@ -523,7 +523,7 @@ g_cancellable_cancel (GCancellable *cancellable)
* @cancellable: A #GCancellable.
* @callback: The #GCallback to connect.
* @data: Data to pass to @callback.
- * @data_destroy_func: Free function for @data or %NULL.
+ * @data_destroy_func: (allow-none): Free function for @data or %NULL.
*
* Convenience function to connect to the #GCancellable::cancelled
* signal. Also handles the race condition that may happen
@@ -584,7 +584,7 @@ g_cancellable_connect (GCancellable *cancellable,
/**
* g_cancellable_disconnect:
- * @cancellable: A #GCancellable or %NULL.
+ * @cancellable: (allow-none): 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
@@ -709,7 +709,7 @@ static GSourceFuncs cancellable_source_funcs =
/**
* g_cancellable_source_new: (skip)
- * @cancellable: a #GCancellable, or %NULL
+ * @cancellable: (allow-none): 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/gdbusaddress.c b/gio/gdbusaddress.c
index 77aff1279..b9509ef21 100644
--- a/gio/gdbusaddress.c
+++ b/gio/gdbusaddress.c
@@ -824,7 +824,7 @@ get_stream_thread_func (GSimpleAsyncResult *res,
/**
* g_dbus_address_get_stream:
* @address: A valid D-Bus address.
- * @cancellable: A #GCancellable or %NULL.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
* @callback: A #GAsyncReadyCallback to call when the request is satisfied.
* @user_data: Data to pass to @callback.
*
@@ -913,7 +913,7 @@ g_dbus_address_get_stream_finish (GAsyncResult *res,
* g_dbus_address_get_stream_sync:
* @address: A valid D-Bus address.
* @out_guid: %NULL or return location to store the GUID extracted from @address, if any.
- * @cancellable: A #GCancellable or %NULL.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
* @error: Return location for error or %NULL.
*
* Synchronously connects to an endpoint specified by @address and
@@ -1163,7 +1163,7 @@ get_session_address_platform_specific (GError **error)
/**
* g_dbus_address_get_for_bus_sync:
* @bus_type: A #GBusType.
- * @cancellable: A #GCancellable or %NULL.
+ * @cancellable: (allow-none): 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 b3a13532d..a55e13df6 100644
--- a/gio/gdbusauthobserver.c
+++ b/gio/gdbusauthobserver.c
@@ -143,7 +143,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: Credentials received from the peer or %NULL.
+ * @credentials: (allow-none): Credentials received from the peer or %NULL.
*
* Emitted to check if a peer that is successfully authenticated
* is authorized.
@@ -192,7 +192,7 @@ g_dbus_auth_observer_new (void)
* g_dbus_auth_observer_authorize_authenticated_peer:
* @observer: A #GDBusAuthObserver.
* @stream: A #GIOStream for the #GDBusConnection.
- * @credentials: Credentials received from the peer or %NULL.
+ * @credentials: (allow-none): 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 44bda5d5e..2a1f09003 100644
--- a/gio/gdbusconnection.c
+++ b/gio/gdbusconnection.c
@@ -249,8 +249,8 @@ call_destroy_notify_data_free (CallDestroyNotifyData *data)
/*
* call_destroy_notify: <internal>
- * @context: A #GMainContext or %NULL.
- * @callback: A #GDestroyNotify or %NULL.
+ * @context: (allow-none): A #GMainContext or %NULL.
+ * @callback: (allow-none): A #GDestroyNotify or %NULL.
* @user_data: Data to pass to @callback.
*
* Schedules @callback to run in @context.
@@ -1209,7 +1209,7 @@ flush_in_thread_func (GSimpleAsyncResult *res,
/**
* g_dbus_connection_flush:
* @connection: A #GDBusConnection.
- * @cancellable: A #GCancellable 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 care about the result.
* @user_data: The data to pass to @callback.
@@ -1294,7 +1294,7 @@ g_dbus_connection_flush_finish (GDBusConnection *connection,
/**
* g_dbus_connection_flush_sync:
* @connection: A #GDBusConnection.
- * @cancellable: A #GCancellable or %NULL.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
* @error: Return location for error or %NULL.
*
* Synchronously flushes @connection. The calling thread is blocked
@@ -1408,7 +1408,7 @@ schedule_closed_unlocked (GDBusConnection *connection,
/**
* g_dbus_connection_close:
* @connection: A #GDBusConnection.
- * @cancellable: A #GCancellable 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 care about the result.
* @user_data: The data to pass to @callback.
@@ -1522,7 +1522,7 @@ sync_close_cb (GObject *source_object,
/**
* g_dbus_connection_close_sync:
* @connection: A #GDBusConnection.
- * @cancellable: A #GCancellable or %NULL.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
* @error: Return location for error or %NULL.
*
* Synchronously closees @connection. The calling thread is blocked
@@ -1985,7 +1985,7 @@ g_dbus_connection_send_message_with_reply_unlocked (GDBusConnection *connect
* timeout or %G_MAXINT for no timeout.
* @out_serial: (out) (allow-none): Return location for serial number assigned
* to @message when sending it or %NULL.
- * @cancellable: A #GCancellable 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 care about the result.
* @user_data: The data to pass to @callback.
@@ -2120,7 +2120,7 @@ send_message_with_reply_sync_cb (GDBusConnection *connection,
* timeout or %G_MAXINT for no timeout.
* @out_serial: (out) (allow-none): Return location for serial number assigned
* to @message when sending it or %NULL.
- * @cancellable: A #GCancellable or %NULL.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
* @error: Return location for error or %NULL.
*
* Synchronously sends @message to the peer represented by @connection
@@ -2665,7 +2665,7 @@ async_initable_iface_init (GAsyncInitableIface *async_initable_iface)
* @guid: (allow-none): 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: A #GCancellable or %NULL.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
* @callback: A #GAsyncReadyCallback to call when the request is satisfied.
* @user_data: The data to pass to @callback.
*
@@ -2753,7 +2753,7 @@ g_dbus_connection_new_finish (GAsyncResult *res,
* @guid: (allow-none): 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: A #GCancellable or %NULL.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
* @error: Return location for error or %NULL.
*
* Synchronously sets up a D-Bus connection for exchanging D-Bus messages
@@ -2803,7 +2803,7 @@ g_dbus_connection_new_sync (GIOStream *stream,
* @address: A D-Bus address.
* @flags: Flags describing how to make the connection.
* @observer: (allow-none): A #GDBusAuthObserver or %NULL.
- * @cancellable: A #GCancellable or %NULL.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
* @callback: A #GAsyncReadyCallback to call when the request is satisfied.
* @user_data: The data to pass to @callback.
*
@@ -2888,7 +2888,7 @@ g_dbus_connection_new_for_address_finish (GAsyncResult *res,
* @address: A D-Bus address.
* @flags: Flags describing how to make the connection.
* @observer: (allow-none): A #GDBusAuthObserver or %NULL.
- * @cancellable: A #GCancellable or %NULL.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
* @error: Return location for error or %NULL.
*
* Synchronously connects and sets up a D-Bus client connection for
@@ -5576,7 +5576,7 @@ g_dbus_connection_call_sync_internal (GDBusConnection *connection,
* @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: A #GCancellable 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 care about the result of the
* method invocation.
@@ -5678,7 +5678,7 @@ g_dbus_connection_call_finish (GDBusConnection *connection,
* @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: A #GCancellable or %NULL.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
* @error: Return location for error or %NULL.
*
* Synchronously invokes the @method_name method on the
@@ -5758,7 +5758,7 @@ g_dbus_connection_call_sync (GDBusConnection *connection,
* @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: A #GCancellable 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 * care about the result of the
* method invocation.
@@ -5791,7 +5791,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): Return location for a #GUnixFDList or %NULL.
+ * @out_fd_list: (out) (allow-none): 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.
*
@@ -5825,8 +5825,8 @@ g_dbus_connection_call_with_unix_fd_list_finish (GDBusConnection *connection,
* @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): Return location for a #GUnixFDList or %NULL.
- * @cancellable: A #GCancellable or %NULL.
+ * @out_fd_list: (out) (allow-none): Return location for a #GUnixFDList or %NULL.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
* @error: Return location for error or %NULL.
*
* Like g_dbus_connection_call_sync() but also takes and returns #GUnixFDList objects.
@@ -6771,7 +6771,7 @@ get_uninitialized_connection (GBusType bus_type,
/**
* g_bus_get_sync:
* @bus_type: A #GBusType.
- * @cancellable: A #GCancellable or %NULL.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
* @error: Return location for error or %NULL.
*
* Synchronously connects to the message bus specified by @bus_type.
@@ -6848,7 +6848,7 @@ bus_get_async_initable_cb (GObject *source_object,
/**
* g_bus_get:
* @bus_type: A #GBusType.
- * @cancellable: A #GCancellable or %NULL.
+ * @cancellable: (allow-none): 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/gdbuserror.c b/gio/gdbuserror.c
index 946670a7e..9e1c50f89 100644
--- a/gio/gdbuserror.c
+++ b/gio/gdbuserror.c
@@ -650,7 +650,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: printf()-style format to prepend to @dbus_error_message or %NULL.
+ * @format: (allow-none): printf()-style format to prepend to @dbus_error_message or %NULL.
* @...: Arguments for @format.
*
* Does nothing if @error is %NULL. Otherwise sets *@error to
@@ -695,7 +695,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: printf()-style format to prepend to @dbus_error_message or %NULL.
+ * @format: (allow-none): 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 d1af07d83..14f1326a0 100644
--- a/gio/gdbusinterface.c
+++ b/gio/gdbusinterface.c
@@ -124,7 +124,7 @@ g_dbus_interface_dup_object (GDBusInterface *interface_)
/**
* g_dbus_interface_set_object:
* @interface_: An exported D-Bus interface.
- * @object: A #GDBusObject or %NULL.
+ * @object: (allow-none): A #GDBusObject or %NULL.
*
* Sets the #GDBusObject for @interface_ to @object.
*
diff --git a/gio/gdbusintrospection.c b/gio/gdbusintrospection.c
index a9c7f1cf3..a97fa43c1 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): A %NULL-terminated array of annotations or %NULL.
+ * @annotations: (array zero-terminated=1) (allow-none): 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 4c968f5bb..ca7f6c5c5 100644
--- a/gio/gdbusmessage.c
+++ b/gio/gdbusmessage.c
@@ -218,9 +218,9 @@ g_dbus_message_new (void)
/**
* g_dbus_message_new_method_call:
- * @name: A valid D-Bus name or %NULL.
+ * @name: (allow-none): A valid D-Bus name or %NULL.
* @path: A valid object path.
- * @interface_: A valid D-Bus interface name or %NULL.
+ * @interface_: (allow-none): A valid D-Bus interface name or %NULL.
* @method: A valid method name.
*
* Creates a new #GDBusMessage for a method call.
@@ -636,7 +636,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: A #GVariant to set the header field or %NULL to clear the header field.
+ * @value: (allow-none): A #GVariant to set the header field or %NULL to clear the header field.
*
* Sets a header field on @message.
*
diff --git a/gio/gdbusmethodinvocation.c b/gio/gdbusmethodinvocation.c
index be3dc5633..18e366d84 100644
--- a/gio/gdbusmethodinvocation.c
+++ b/gio/gdbusmethodinvocation.c
@@ -286,11 +286,11 @@ g_dbus_method_invocation_get_user_data (GDBusMethodInvocation *invocation)
/* < internal >
* _g_dbus_method_invocation_new:
- * @sender: The bus name that invoked the method or %NULL if @connection is not a bus connection.
+ * @sender: (allow-none): 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: Information about the method call or %NULL.
+ * @method_info: (allow-none): Information about the method call 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.
diff --git a/gio/gdbusnameowning.c b/gio/gdbusnameowning.c
index 207fa60b9..260b08843 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: Handler to invoke when @name is acquired or %NULL.
- * @name_lost_handler: Handler to invoke when @name is lost 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.
* @user_data: User data to pass to handlers.
- * @user_data_free_func: Function for freeing @user_data or %NULL.
+ * @user_data_free_func: (allow-none): 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: Handler to invoke when connected to the bus of type @bus_type or %NULL.
- * @name_acquired_handler: Handler to invoke when @name is acquired or %NULL.
- * @name_lost_handler: Handler to invoke when @name is lost or %NULL.
+ * @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.
* @user_data: User data to pass to handlers.
- * @user_data_free_func: Function for freeing @user_data or %NULL.
+ * @user_data_free_func: (allow-none): 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
diff --git a/gio/gdbusnamewatching.c b/gio/gdbusnamewatching.c
index bdda901e5..12e8ed762 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: Handler to invoke when @name is known to exist or %NULL.
- * @name_vanished_handler: Handler to invoke when @name is known to not exist or %NULL.
+ * @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.
* @user_data: User data to pass to handlers.
- * @user_data_free_func: Function for freeing @user_data or %NULL.
+ * @user_data_free_func: (allow-none): 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: Handler to invoke when @name is known to exist or %NULL.
- * @name_vanished_handler: Handler to invoke when @name is known to not exist or %NULL.
+ * @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.
* @user_data: User data to pass to handlers.
- * @user_data_free_func: Function for freeing @user_data or %NULL.
+ * @user_data_free_func: (allow-none): Function for freeing @user_data or %NULL.
*
* Like g_bus_watch_name() but takes a #GDBusConnection instead of a
* #GBusType.
diff --git a/gio/gdbusobjectmanagerclient.c b/gio/gdbusobjectmanagerclient.c
index aeff7e41c..a207104c1 100644
--- a/gio/gdbusobjectmanagerclient.c
+++ b/gio/gdbusobjectmanagerclient.c
@@ -587,10 +587,10 @@ g_dbus_object_manager_client_init (GDBusObjectManagerClient *manager)
* @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: A #GDBusProxyTypeFunc function or %NULL to always construct #GDBusProxy proxies.
+ * @get_proxy_type_func: (allow-none): 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: A #GCancellable or %NULL
+ * @cancellable: (allow-none): A #GCancellable or %NULL
* @error: Return location for error or %NULL.
*
* Creates a new #GDBusObjectManagerClient object.
@@ -647,10 +647,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: A #GDBusProxyTypeFunc function or %NULL to always construct #GDBusProxy proxies.
+ * @get_proxy_type_func: (allow-none): 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: A #GCancellable or %NULL
+ * @cancellable: (allow-none): A #GCancellable or %NULL
* @callback: A #GAsyncReadyCallback to call when the request is satisfied.
* @user_data: The data to pass to @callback.
*
@@ -739,10 +739,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: A #GDBusProxyTypeFunc function or %NULL to always construct #GDBusProxy proxies.
+ * @get_proxy_type_func: (allow-none): 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: A #GCancellable or %NULL
+ * @cancellable: (allow-none): A #GCancellable or %NULL
* @error: Return location for error or %NULL.
*
* Like g_dbus_object_manager_client_new_sync() but takes a #GBusType instead
@@ -799,10 +799,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: A #GDBusProxyTypeFunc function or %NULL to always construct #GDBusProxy proxies.
+ * @get_proxy_type_func: (allow-none): 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: A #GCancellable or %NULL
+ * @cancellable: (allow-none): 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/gdbusproxy.c b/gio/gdbusproxy.c
index ed46935df..5bab9bfbb 100644
--- a/gio/gdbusproxy.c
+++ b/gio/gdbusproxy.c
@@ -612,7 +612,7 @@ g_dbus_proxy_class_init (GDBusProxyClass *klass)
/**
* GDBusProxy::g-signal:
* @proxy: The #GDBusProxy emitting the signal.
- * @sender_name: The sender of the signal or %NULL if the connection is not a bus connection.
+ * @sender_name: (allow-none): 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.
*
@@ -2007,7 +2007,7 @@ initable_iface_init (GInitableIface *initable_iface)
* @name: (allow-none): 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: A #GCancellable or %NULL.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
* @callback: Callback function to invoke when the proxy is ready.
* @user_data: User data to pass to @callback.
*
@@ -2177,7 +2177,7 @@ g_dbus_proxy_new_sync (GDBusConnection *connection,
* @name: A bus name (well-known or unique).
* @object_path: An object path.
* @interface_name: A D-Bus interface name.
- * @cancellable: A #GCancellable or %NULL.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
* @callback: Callback function to invoke when the proxy is ready.
* @user_data: User data to pass to @callback.
*
@@ -2243,7 +2243,7 @@ g_dbus_proxy_new_for_bus_finish (GAsyncResult *res,
* @name: A bus name (well-known or unique).
* @object_path: An object path.
* @interface_name: A D-Bus interface name.
- * @cancellable: A #GCancellable or %NULL.
+ * @cancellable: (allow-none): 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.
@@ -2936,8 +2936,8 @@ g_dbus_proxy_call_sync_internal (GDBusProxy *proxy,
* @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: A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't
+ * @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
* care about the result of the method invocation.
* @user_data: The data to pass to @callback.
*
@@ -3029,7 +3029,7 @@ g_dbus_proxy_call_finish (GDBusProxy *proxy,
* @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: A #GCancellable or %NULL.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
* @error: Return location for error or %NULL.
*
* Synchronously invokes the @method_name method on @proxy.
@@ -3097,8 +3097,8 @@ g_dbus_proxy_call_sync (GDBusProxy *proxy,
* @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: A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't
+ * @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
* care about the result of the method invocation.
* @user_data: The data to pass to @callback.
*
@@ -3125,7 +3125,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): Return location for a #GUnixFDList or %NULL.
+ * @out_fd_list: (out) (allow-none): 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.
*
@@ -3155,8 +3155,8 @@ g_dbus_proxy_call_with_unix_fd_list_finish (GDBusProxy *proxy,
* @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): Return location for a #GUnixFDList or %NULL.
- * @cancellable: A #GCancellable or %NULL.
+ * @out_fd_list: (out) (allow-none): Return location for a #GUnixFDList or %NULL.
+ * @cancellable: (allow-none): 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 7dde45305..5e7dd85fa 100644
--- a/gio/gdbusserver.c
+++ b/gio/gdbusserver.c
@@ -448,7 +448,7 @@ on_run (GSocketService *service,
* @flags: Flags from the #GDBusServerFlags enumeration.
* @guid: A D-Bus GUID.
* @observer: (allow-none): A #GDBusAuthObserver or %NULL.
- * @cancellable: A #GCancellable or %NULL.
+ * @cancellable: (allow-none): 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/gfile.c b/gio/gfile.c
index 306d014c0..7e963ca05 100644
--- a/gio/gfile.c
+++ b/gio/gfile.c
@@ -887,7 +887,7 @@ g_file_enumerate_children (GFile *file,
* @io_priority: the <link linkend="io-priority">I/O priority</link>
* of the request.
* @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @callback: (scope async): a #GAsyncReadyCallback to call when the
+ * @callback: (scope async) : a #GAsyncReadyCallback to call when the
* request is satisfied
* @user_data: (closure): the data to pass to callback function
*
@@ -4235,7 +4235,7 @@ g_file_set_attribute_int64 (GFile *file,
* @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: (scope async): a #GAsyncReadyCallback to call when the request is satisfied, or %NULL.
+ * @callback: (scope async) (allow-none): a #GAsyncReadyCallback to call when the request is satisfied, or %NULL.
* @user_data: (closure): the data to pass to callback function
*
* Mounts a file of type G_FILE_TYPE_MOUNTABLE.
@@ -4322,7 +4322,7 @@ g_file_mount_mountable_finish (GFile *file,
* @file: input #GFile.
* @flags: flags affecting the operation
* @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request is satisfied, or %NULL.
+ * @callback: (scope async) (allow-none): a #GAsyncReadyCallback to call when the request is satisfied, or %NULL.
* @user_data: (closure): the data to pass to callback function
*
* Unmounts a file of type G_FILE_TYPE_MOUNTABLE.
@@ -4410,7 +4410,7 @@ g_file_unmount_mountable_finish (GFile *file,
* @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: (scope async): a #GAsyncReadyCallback to call when the request is satisfied, or %NULL.
+ * @callback: (scope async) (allow-none): a #GAsyncReadyCallback to call when the request is satisfied, or %NULL.
* @user_data: (closure): the data to pass to callback function
*
* Unmounts a file of type G_FILE_TYPE_MOUNTABLE.
@@ -4509,7 +4509,7 @@ g_file_unmount_mountable_with_operation_finish (GFile *file,
* @file: input #GFile.
* @flags: flags affecting the operation
* @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request is satisfied, or %NULL.
+ * @callback: (scope async) (allow-none): a #GAsyncReadyCallback to call when the request is satisfied, or %NULL.
* @user_data: (closure): the data to pass to callback function
*
* Starts an asynchronous eject on a mountable.
@@ -4595,7 +4595,7 @@ g_file_eject_mountable_finish (GFile *file,
* @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: (scope async): a #GAsyncReadyCallback to call when the request is satisfied, or %NULL.
+ * @callback: (scope async) (allow-none): a #GAsyncReadyCallback to call when the request is satisfied, or %NULL.
* @user_data: (closure): the data to pass to callback function
*
* Starts an asynchronous eject on a mountable.
@@ -6032,7 +6032,7 @@ g_file_new_for_commandline_arg (const char *arg)
* @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: a #GAsyncReadyCallback to call when the request is satisfied, or %NULL.
+ * @callback: (allow-none): a #GAsyncReadyCallback to call when the request is satisfied, or %NULL.
* @user_data: the data to pass to callback function
*
* Starts a @mount_operation, mounting the volume that contains the file @location.
@@ -6967,8 +6967,8 @@ g_file_replace_contents_finish (GFile *file,
* @file: input #GFile.
* @flags: flags affecting the operation
* @start_operation: (allow-none): a #GMountOperation, or %NULL to avoid user interaction.
- * @cancellable: optional #GCancellable object, %NULL to ignore.
- * @callback: a #GAsyncReadyCallback to call when the request is satisfied, or %NULL.
+ * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @callback: (allow-none): 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.
@@ -7059,8 +7059,8 @@ g_file_start_mountable_finish (GFile *file,
* @file: input #GFile.
* @flags: flags affecting the operation
* @mount_operation: (allow-none): a #GMountOperation, or %NULL to avoid user interaction.
- * @cancellable: optional #GCancellable object, %NULL to ignore.
- * @callback: a #GAsyncReadyCallback to call when the request is satisfied, or %NULL.
+ * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @callback: (allow-none): a #GAsyncReadyCallback to call when the request is satisfied, or %NULL.
* @user_data: the data to pass to callback function
*
* Stops a file of type G_FILE_TYPE_MOUNTABLE.
@@ -7148,7 +7148,7 @@ g_file_stop_mountable_finish (GFile *file,
* g_file_poll_mountable:
* @file: input #GFile.
* @cancellable: optional #GCancellable object, %NULL to ignore.
- * @callback: a #GAsyncReadyCallback to call when the request is satisfied, or %NULL.
+ * @callback: (allow-none): a #GAsyncReadyCallback to call when the request is satisfied, or %NULL.
* @user_data: the data to pass to callback function
*
* Polls a file of type G_FILE_TYPE_MOUNTABLE.
diff --git a/gio/ginitable.c b/gio/ginitable.c
index b68e5c81a..e3c81f185 100644
--- a/gio/ginitable.c
+++ b/gio/ginitable.c
@@ -121,7 +121,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: the name of the first property, or %NULL if no
+ * @first_property_name: (allow-none): 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/gioscheduler.c b/gio/gioscheduler.c
index 36db5f256..e91ecdedd 100644
--- a/gio/gioscheduler.c
+++ b/gio/gioscheduler.c
@@ -188,7 +188,7 @@ io_job_thread (gpointer data,
* g_io_scheduler_push_job:
* @job_func: a #GIOSchedulerJobFunc.
* @user_data: data to pass to @job_func
- * @notify: a #GDestroyNotify for @user_data, or %NULL
+ * @notify: (allow-none): a #GDestroyNotify for @user_data, or %NULL
* @io_priority: the <link linkend="gioscheduler">I/O priority</link>
* of the request.
* @cancellable: optional #GCancellable object, %NULL to ignore.
@@ -309,7 +309,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: a #GDestroyNotify for @user_data, or %NULL
+ * @notify: (allow-none): 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
@@ -361,7 +361,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: a #GDestroyNotify for @user_data, or %NULL
+ * @notify: (allow-none): 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/gmemoryoutputstream.c b/gio/gmemoryoutputstream.c
index 182d2dead..08b4fba6b 100644
--- a/gio/gmemoryoutputstream.c
+++ b/gio/gmemoryoutputstream.c
@@ -329,11 +329,11 @@ g_memory_output_stream_init (GMemoryOutputStream *stream)
/**
* g_memory_output_stream_new: (skip)
- * @data: pointer to a chunk of memory to use, or %NULL
+ * @data: (allow-none): pointer to a chunk of memory to use, or %NULL
* @size: the size of @data
- * @realloc_function: a function with realloc() semantics (like g_realloc())
+ * @realloc_function: (allow-none): a function with realloc() semantics (like g_realloc())
* to be called when @data needs to be grown, or %NULL
- * @destroy_function: a function to be called on @data when the stream is
+ * @destroy_function: (allow-none): a function to be called on @data when the stream is
* finalized, or %NULL
*
* Creates a new #GMemoryOutputStream.
diff --git a/gio/gnetworkmonitor.c b/gio/gnetworkmonitor.c
index 9afc42176..f3359ef1d 100644
--- a/gio/gnetworkmonitor.c
+++ b/gio/gnetworkmonitor.c
@@ -104,7 +104,7 @@ g_network_monitor_get_network_available (GNetworkMonitor *monitor)
* g_network_monitor_can_reach:
* @monitor: a #GNetworkMonitor
* @connectable: a #GSocketConnectable
- * @cancellable: a #GCancellable, or %NULL
+ * @cancellable: (allow-none): a #GCancellable, or %NULL
* @error: return location for a #GError, or %NULL
*
* Attempts to determine whether or not the host pointed to by
@@ -166,7 +166,7 @@ g_network_monitor_real_can_reach_async (GNetworkMonitor *monitor,
* g_network_monitor_can_reach_async:
* @monitor: a #GNetworkMonitor
* @connectable: a #GSocketConnectable
- * @cancellable: a #GCancellable, or %NULL
+ * @cancellable: (allow-none): 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/gpermission.c b/gio/gpermission.c
index aefccaad2..422fb12ce 100644
--- a/gio/gpermission.c
+++ b/gio/gpermission.c
@@ -74,7 +74,7 @@ enum {
/**
* g_permission_acquire:
* @permission: a #GPermission instance
- * @cancellable: a #GCancellable, or %NULL
+ * @cancellable: (allow-none): a #GCancellable, or %NULL
* @error: a pointer to a %NULL #GError, or %NULL
*
* Attempts to acquire the permission represented by @permission.
@@ -109,7 +109,7 @@ g_permission_acquire (GPermission *permission,
/**
* g_permission_acquire_async:
* @permission: a #GPermission instance
- * @cancellable: a #GCancellable, or %NULL
+ * @cancellable: (allow-none): a #GCancellable, or %NULL
* @callback: the #GAsyncReadyCallback to call when done
* @user_data: the user data to pass to @callback
*
@@ -158,7 +158,7 @@ g_permission_acquire_finish (GPermission *permission,
/**
* g_permission_release:
* @permission: a #GPermission instance
- * @cancellable: a #GCancellable, or %NULL
+ * @cancellable: (allow-none): a #GCancellable, or %NULL
* @error: a pointer to a %NULL #GError, or %NULL
*
* Attempts to release the permission represented by @permission.
@@ -193,7 +193,7 @@ g_permission_release (GPermission *permission,
/**
* g_permission_release_async:
* @permission: a #GPermission instance
- * @cancellable: a #GCancellable, or %NULL
+ * @cancellable: (allow-none): a #GCancellable, or %NULL
* @callback: the #GAsyncReadyCallback to call when done
* @user_data: the user data to pass to @callback
*
diff --git a/gio/gsettingsbackend.c b/gio/gsettingsbackend.c
index f2f11eb5d..c89531ad3 100644
--- a/gio/gsettingsbackend.c
+++ b/gio/gsettingsbackend.c
@@ -177,7 +177,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: a #GMainContext, or %NULL
+ * @context: (allow-none): a #GMainContext, or %NULL
* ...: callbacks...
*
* Registers a new watch on a #GSettingsBackend.
diff --git a/gio/gsimpleasyncresult.c b/gio/gsimpleasyncresult.c
index 7ab2cd2db..1b951194c 100644
--- a/gio/gsimpleasyncresult.c
+++ b/gio/gsimpleasyncresult.c
@@ -1061,7 +1061,7 @@ g_simple_async_report_take_gerror_in_idle (GObject *object,
/**
* g_simple_async_result_set_check_cancellable:
* @simple: a #GSimpleAsyncResult
- * @check_cancellable: a #GCancellable to check, or %NULL to unset
+ * @check_cancellable: (allow-none): a #GCancellable to check, or %NULL to unset
*
* Sets a #GCancellable to check before dispatching results.
*
diff --git a/gio/gsocket.c b/gio/gsocket.c
index a28546f32..0fa133fe8 100644
--- a/gio/gsocket.c
+++ b/gio/gsocket.c
@@ -2695,7 +2695,7 @@ g_socket_send_with_blocking (GSocket *socket,
/**
* g_socket_send_to:
* @socket: a #GSocket
- * @address: a #GSocketAddress, or %NULL
+ * @address: (allow-none): 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
@@ -3584,7 +3584,7 @@ g_socket_condition_timed_wait (GSocket *socket,
/**
* g_socket_send_message:
* @socket: a #GSocket
- * @address: a #GSocketAddress, or %NULL
+ * @address: (allow-none): 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
diff --git a/gio/gsocketclient.c b/gio/gsocketclient.c
index d24694760..63c26aa90 100644
--- a/gio/gsocketclient.c
+++ b/gio/gsocketclient.c
@@ -482,7 +482,7 @@ g_socket_client_get_local_address (GSocketClient *client)
/**
* g_socket_client_set_local_address:
* @client: a #GSocketClient.
- * @address: a #GSocketAddress, or %NULL
+ * @address: (allow-none): a #GSocketAddress, or %NULL
*
* Sets the local address of the socket client.
* The sockets created by this object will bound to the
diff --git a/gio/gtlsconnection.c b/gio/gtlsconnection.c
index 5e66dd1b6..7d33e3739 100644
--- a/gio/gtlsconnection.c
+++ b/gio/gtlsconnection.c
@@ -730,7 +730,7 @@ g_tls_connection_get_rehandshake_mode (GTlsConnection *conn)
/**
* g_tls_connection_handshake:
* @conn: a #GTlsConnection
- * @cancellable: a #GCancellable, or %NULL
+ * @cancellable: (allow-none): a #GCancellable, or %NULL
* @error: a #GError, or %NULL
*
* Attempts a TLS handshake on @conn.
@@ -775,7 +775,7 @@ g_tls_connection_handshake (GTlsConnection *conn,
* @conn: a #GTlsConnection
* @io_priority: the <link linkend="io-priority">I/O priority</link>
* of the request.
- * @cancellable: a #GCancellable, or %NULL
+ * @cancellable: (allow-none): 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/gvolume.c b/gio/gvolume.c
index d932d0830..97f9485c3 100644
--- a/gio/gvolume.c
+++ b/gio/gvolume.c
@@ -454,7 +454,7 @@ g_volume_eject_finish (GVolume *volume,
* @mount_operation: (allow-none): a #GMountOperation or %NULL to
* avoid user interaction.
* @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @callback: a #GAsyncReadyCallback, or %NULL.
+ * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL.
* @user_data: user data passed to @callback.
*
* Ejects a volume. This is an asynchronous operation, and is