Commit 18a33f72 authored by Christian Hergert's avatar Christian Hergert

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.
parent a4012abb
......@@ -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.
*
......
......@@ -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.
*
......
......@@ -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().
*
......
......@@ -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.
......
......@@ -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.
*
......
......@@ -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.
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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.
......
......@@ -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
*
......
......@@ -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.
......
......@@ -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
......
......@@ -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.
*
......
......@@ -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