gi: Fix annotations

Mainly missing nullable on return values

12 files changed, 67 insertions, 67 deletions

diff --git a/libgupnp/gupnp-acl.c b/libgupnp/gupnp-acl.c
index d3c1860..05a4922 100644
--- a/libgupnp/gupnp-acl.c
+++ b/libgupnp/gupnp-acl.c
@@ -46,13 +46,13 @@ gupnp_acl_default_init (GUPnPAclInterface *klass)
 /**
  * gupnp_acl_is_allowed:
  * @self: an instance of #GUPnPAcl
- * @device: (allow-none): The #GUPnPDevice associated with @path or %NULL if
+ * @device: (nullable): The #GUPnPDevice associated with @path or %NULL if
  * unknown.
- * @service: (allow-none): The #GUPnPService associated with @path or %NULL if
+ * @service: (nullable): The #GUPnPService associated with @path or %NULL if
  * unknown.
  * @path: The path being served.
  * @address: IP address of the peer.
- * @agent: (allow-none): The User-Agent header of the peer or %NULL if not
+ * @agent: (nullable): The User-Agent header of the peer or %NULL if not
  * unknown.
  * @returns %TRUE if the peer is allowed, %FALSE otherwise
  *
@@ -81,15 +81,15 @@ gupnp_acl_is_allowed (GUPnPAcl     *self,
 /**
  * gupnp_acl_is_allowed_async:
  * @self: a #GUPnPAcl
- * @device: (allow-none): The #GUPnPDevice associated with @path or %NULL if
+ * @device: (nullable): The #GUPnPDevice associated with @path or %NULL if
  * unknown.
- * @service: (allow-none): The #GUPnPService associated with @path or %NULL if
+ * @service: (nullable): The #GUPnPService associated with @path or %NULL if
  * unknown.
  * @path: The path being served.
  * @address: IP address of the peer
- * @agent: (allow-none): The User-Agent header of the peer or %NULL if not
+ * @agent: (nullable): The User-Agent header of the peer or %NULL if not
  * unknown.
- * @cancellable: (allow-none): A #GCancellable which can be used to cancel the
+ * @cancellable: (nullable): A #GCancellable which can be used to cancel the
  * operation.
  * @callback: Callback to call after the function is done.
  * @user_data: Some user data.
@@ -132,7 +132,7 @@ gupnp_acl_is_allowed_async (GUPnPAcl           *self,
  * gupnp_acl_is_allowed_finish:
  * @self: An instance of #GUPnPAcl
  * @res: %GAsyncResult obtained from the callback in gupnp_acl_is_allowed_async()
- * @error: (allow-none): A return location for a #GError describing the failure
+ * @error: (inout)(optional)(nullable): A return location for a #GError describing the failure
  * @returns %TRUE if the authentication was successful, %FALSE otherwise and on
  * error. Check @error for details.
  *
@@ -170,11 +170,11 @@ gupnp_acl_can_sync (GUPnPAcl *self)
 
 /**
  * acl_server_handler_new:
- * @service: (allow-none): A #GUPnPContext or %NULL if unknown
+ * @service: (nullable): A #GUPnPContext or %NULL if unknown
  * @context: The #GUPnPContext the server handler is run on.
  * @callback: The #SoupServerCallback we're wrapping.
  * @user_data: The user_data for @callback
- * @notify: (allow-none): The #GDestroyNotify for @user_data or %NULL if none.
+ * @notify: (nullable): The #GDestroyNotify for @user_data or %NULL if none.
  * @returns: A newly allocated #AclServerHandler
  *
  * Allocate a new #AclServerHandler.
@@ -222,7 +222,7 @@ acl_server_handler_free (AclServerHandler *handler)
  * @server: A #SoupServer instance.
  * @message: The #SoupMessage we want to handle.
  * @path: The path we're trying to serve.
- * @query: (allow-none): The query parameters of the request.
+ * @query: (nullable): The query parameters of the request.
  * @client: The #SoupClientContext for this request.
  * @handler: The #AclServerHandler used with this request.
  * @returns: A new instance of #AclAsyncHandler.
diff --git a/libgupnp/gupnp-context.c b/libgupnp/gupnp-context.c
index ef7194c..2da9e7a 100644
--- a/libgupnp/gupnp-context.c
+++ b/libgupnp/gupnp-context.c
@@ -664,10 +664,10 @@ _gupnp_context_get_server_uri (GUPnPContext *context)
 
 /**
  * gupnp_context_new:
- * @iface: (allow-none): The network interface to use, or %NULL to
+ * @iface: (nullable): The network interface to use, or %NULL to
  * auto-detect.
  * @port: Port to run on, or 0 if you don't care what port is used.
- * @error: A location to store a #GError, or %NULL
+ * @error: (inout)(optional)(nullable): A location to store a #GError, or %NULL
  *
  * Create a new #GUPnPContext with the specified @main_context, @iface and
  * @port.
@@ -1405,7 +1405,7 @@ gupnp_context_get_acl (GUPnPContext *context)
 /**
  * gupnp_context_set_acl:
  * @context: A #GUPnPContext
- * @acl: (allow-none): The new access control list or %NULL to remove the
+ * @acl: (nullable): The new access control list or %NULL to remove the
  * current list.
  *
  * Attach or remove the assoicated access control list to this context. If
@@ -1531,7 +1531,7 @@ gupnp_acl_server_handler (SoupServer *server,
  * @path: the toplevel path for the handler.
  * @callback: callback to invoke for requests under @path
  * @user_data: the user_data passed to @callback
- * @destroy: (allow-none): A #GDestroyNotify for @user_data or %NULL if none.
+ * @destroy: (nullable): A #GDestroyNotify for @user_data or %NULL if none.
  *
  * Add a #SoupServerCallback to the #GUPnPContext<!-- -->'s #SoupServer.
  *
diff --git a/libgupnp/gupnp-device-info.c b/libgupnp/gupnp-device-info.c
index 295f3c1..376ee28 100644
--- a/libgupnp/gupnp-device-info.c
+++ b/libgupnp/gupnp-device-info.c
@@ -514,7 +514,7 @@ gupnp_device_info_get_friendly_name (GUPnPDeviceInfo *info)
  *
  * Get the manufacturer of the device.
  *
- * Return value: A string, or %NULL. g_free() after use.
+ * Return value:(nullable)(transfer full): A string, or %NULL. g_free() after use.
  **/
 char *
 gupnp_device_info_get_manufacturer (GUPnPDeviceInfo *info)
@@ -535,7 +535,7 @@ gupnp_device_info_get_manufacturer (GUPnPDeviceInfo *info)
  *
  * Get an URL pointing to the manufacturer's website.
  *
- * Return value: A string, or %NULL. g_free() after use.
+ * Return value:(nullable)(transfer full): A string, or %NULL. g_free() after use.
  **/
 char *
 gupnp_device_info_get_manufacturer_url (GUPnPDeviceInfo *info)
@@ -557,7 +557,7 @@ gupnp_device_info_get_manufacturer_url (GUPnPDeviceInfo *info)
  *
  * Get the description of the device model.
  *
- * Return value: A string, or %NULL. g_free() after use.
+ * Return value:(nullable)(transfer full): A string, or %NULL. g_free() after use.
  **/
 char *
 gupnp_device_info_get_model_description (GUPnPDeviceInfo *info)
@@ -578,7 +578,7 @@ gupnp_device_info_get_model_description (GUPnPDeviceInfo *info)
  *
  * Get the model name of the device.
  *
- * Return value: A string, or %NULL. g_free() after use.
+ * Return value:(nullable)(transfer full): A string, or %NULL. g_free() after use.
  **/
 char *
 gupnp_device_info_get_model_name (GUPnPDeviceInfo *info)
@@ -599,7 +599,7 @@ gupnp_device_info_get_model_name (GUPnPDeviceInfo *info)
  *
  * Get the model number of the device.
  *
- * Return value: A string, or %NULL. g_free() after use.
+ * Return value:(nullable)(transfer full): A string, or %NULL. g_free() after use.
  **/
 char *
 gupnp_device_info_get_model_number (GUPnPDeviceInfo *info)
@@ -620,7 +620,7 @@ gupnp_device_info_get_model_number (GUPnPDeviceInfo *info)
  *
  * Get an URL pointing to the device model's website.
  *
- * Return value: A string, or %NULL. g_free() after use.
+ * Return value:(nullable)(transfer full): A string, or %NULL. g_free() after use.
  **/
 char *
 gupnp_device_info_get_model_url (GUPnPDeviceInfo *info)
@@ -642,7 +642,7 @@ gupnp_device_info_get_model_url (GUPnPDeviceInfo *info)
  *
  * Get the serial number of the device.
  *
- * Return value: A string, or %NULL. g_free() after use.
+ * Return value:(nullable)(transfer full): A string, or %NULL. g_free() after use.
  **/
 char *
 gupnp_device_info_get_serial_number (GUPnPDeviceInfo *info)
@@ -663,7 +663,7 @@ gupnp_device_info_get_serial_number (GUPnPDeviceInfo *info)
  *
  * Get the Universal Product Code of the device.
  *
- * Return value: A string, or %NULL. g_free() after use.
+ * Return value:(nullable)(transfer full): A string, or %NULL. g_free() after use.
  **/
 char *
 gupnp_device_info_get_upc (GUPnPDeviceInfo *info)
@@ -685,7 +685,7 @@ gupnp_device_info_get_upc (GUPnPDeviceInfo *info)
  * Get an URL pointing to the device's presentation page, for web-based
  * administration.
  *
- * Return value: A string, or %NULL. g_free() after use.
+ * Return value:(nullable)(transfer full): A string, or %NULL. g_free() after use.
  **/
 char *
 gupnp_device_info_get_presentation_url (GUPnPDeviceInfo *info)
@@ -747,21 +747,21 @@ icon_free (Icon *icon)
 /**
  * gupnp_device_info_get_icon_url:
  * @info: A #GUPnPDeviceInfo
- * @requested_mime_type: (allow-none) (transfer none): The requested file
+ * @requested_mime_type: (nullable) (transfer none): The requested file
  * format, or %NULL for any
  * @requested_depth: The requested color depth, or -1 for any
  * @requested_width: The requested width, or -1 for any
  * @requested_height: The requested height, or -1 for any
  * @prefer_bigger: %TRUE if a bigger, rather than a smaller icon should be
  * returned if no exact match could be found
- * @mime_type: (out) (allow-none): The location where to store the the format
+ * @mime_type: (out) (optional): The location where to store the the format
  * of the returned icon, or %NULL. The returned string should be freed after
  * use
- * @depth: (out) (allow-none):  The location where to store the depth of the
+ * @depth: (out) (optional):  The location where to store the depth of the
  * returned icon, or %NULL
- * @width: (out) (allow-none): The location where to store the width of the
+ * @width: (out) (optional): The location where to store the width of the
  * returned icon, or %NULL
- * @height: (out) (allow-none): The location where to store the height of the
+ * @height: (out) (optional): The location where to store the height of the
  * returned icon, or %NULL
  *
  * Get an URL pointing to the icon most closely matching the
@@ -772,7 +772,7 @@ icon_free (Icon *icon)
  * returned, unless @prefer_bigger is set, in which case the next biggest icon
  * will be returned. The returned strings should be freed.
  *
- * Return value: (transfer full): a string, or %NULL.  g_free() after use.
+ * Return value:(nullable)(transfer full): a string, or %NULL.  g_free() after use.
  **/
 char *
 gupnp_device_info_get_icon_url (GUPnPDeviceInfo *info,
@@ -1012,7 +1012,7 @@ resource_type_match (const char *query,
  * Get a #GList of strings that represent the device class and version as
  * announced in the device description file using the &lt;dlna:X_DLNADOC&gt;
  * element.
- * Returns: (transfer full) (element-type utf8): a #GList of newly allocated strings or
+ * Returns:(nullable)(transfer full) (element-type utf8): a #GList of newly allocated strings or
  * %NULL if the device description doesn't contain the &lt;dlna:X_DLNADOC&gt;
  * element.
  *
@@ -1059,7 +1059,7 @@ gupnp_device_info_list_dlna_device_class_identifier (GUPnPDeviceInfo *info)
  * Get a #GList of strings that represent the device capabilities as announced
  * in the device description file using the &lt;dlna:X_DLNACAP&gt; element.
  *
- * Returns: (transfer full) (element-type utf8): a #GList of newly allocated strings or
+ * Returns:(nullable)(transfer full) (element-type utf8): a #GList of newly allocated strings or
  * %NULL if the device description doesn't contain the &lt;dlna:X_DLNACAP&gt;
  * element.
  *
@@ -1119,7 +1119,7 @@ gupnp_device_info_list_dlna_capabilities (GUPnPDeviceInfo *info)
  * This function provides generic access to the contents of arbitrary elements
  * in the device description file.
  *
- * Return value: a newly allocated string or %NULL if the device
+ * Return value:(nullable)(transfer full): a newly allocated string or %NULL if the device
  *               description doesn't contain the given @element
  *
  * Since: 0.14.0
@@ -1152,7 +1152,7 @@ gupnp_device_info_get_description_value (GUPnPDeviceInfo *info,
  * must cache any used devices if it wishes to keep them around and re-use
  * them.
  *
- * Return value: (element-type GUPnP.DeviceInfo) (transfer full): a #GList of
+ * Return value:(nullable)(element-type GUPnP.DeviceInfo) (transfer full): a #GList of
  * new #GUPnPDeviceInfo objects.
  **/
 GList *
@@ -1198,7 +1198,7 @@ gupnp_device_info_list_devices (GUPnPDeviceInfo *info)
  * Get a #GList of strings representing the types of the devices
  * directly contained in @info.
  *
- * Return value: (element-type utf8) (transfer full): A #GList of strings. The
+ * Return value:(nullable)(element-type utf8) (transfer full): A #GList of strings. The
  * elements should be g_free()'d and the list should be g_list_free()'d.
  **/
 GList *
@@ -1249,7 +1249,7 @@ gupnp_device_info_list_device_types (GUPnPDeviceInfo *info)
  * this function a new object is created. The application must cache any used
  * devices if it wishes to keep them around and re-use them.
  *
- * Returns: (transfer full)(allow-none): A new #GUPnPDeviceInfo.
+ * Returns: (transfer full)(nullable): A new #GUPnPDeviceInfo.
  **/
 GUPnPDeviceInfo *
 gupnp_device_info_get_device (GUPnPDeviceInfo *info,
@@ -1315,7 +1315,7 @@ gupnp_device_info_get_device (GUPnPDeviceInfo *info,
  * function new objects are created. The application must cache any used
  * services if it wishes to keep them around and re-use them.
  *
- * Return value: (element-type GUPnP.ServiceInfo) (transfer full) : A #GList of
+ * Return value: (nullable)(element-type GUPnP.ServiceInfo) (transfer full) : A #GList of
  * new #GUPnPServiceInfo objects.
  */
 GList *
@@ -1361,7 +1361,7 @@ gupnp_device_info_list_services (GUPnPDeviceInfo *info)
  * Get a #GList of strings representing the types of the services
  * directly contained in @info.
  *
- * Return value: (element-type utf8) (transfer full): A #GList of strings. The
+ * Return value: (nullable)(element-type utf8) (transfer full): A #GList of strings. The
  * elements should be g_free()'d and the list should be g_list_free()'d.
  **/
 GList *
@@ -1412,7 +1412,7 @@ gupnp_device_info_list_service_types (GUPnPDeviceInfo *info)
  * this function a new object is created. The application must cache any used
  * services if it wishes to keep them around and re-use them.
  *
- * Returns: (transfer full)(allow-none): A #GUPnPServiceInfo.
+ * Returns: (nullable)(transfer full): A #GUPnPServiceInfo.
  **/
 GUPnPServiceInfo *
 gupnp_device_info_get_service (GUPnPDeviceInfo *info,
diff --git a/libgupnp/gupnp-resource-factory.c b/libgupnp/gupnp-resource-factory.c
index b6540f4..306bc03 100644
--- a/libgupnp/gupnp-resource-factory.c
+++ b/libgupnp/gupnp-resource-factory.c
@@ -201,7 +201,7 @@ lookup_type_with_fallback (GHashTable *resource_types,
  * Create a #GUPnPDeviceProxy for the device with element @element, as
  * read from the device description file specified by @location.
  *
- * Return value: A new #GUPnPDeviceProxy.
+ * Return value:(nullable)(transfer full): A new #GUPnPDeviceProxy.
  **/
 GUPnPDeviceProxy *
 gupnp_resource_factory_create_device_proxy
@@ -253,14 +253,14 @@ gupnp_resource_factory_create_device_proxy
  * @element: The #xmlNode pointing to the right service element
  * @location: The location of the service description file
  * @udn: The UDN of the device the service is contained in
- * @service_type: (allow-none): The service type, or %NULL to use service
+ * @service_type: (nullable): The service type, or %NULL to use service
  * type from @element
  * @url_base: The URL base for this service, or %NULL if none
  *
  * Create a #GUPnPServiceProxy for the service with element @element, as
  * read from the service description file specified by @location.
  *
- * Return value: A new #GUPnPServiceProxy.
+ * Return value:(nullable)(transfer full): A new #GUPnPServiceProxy.
  **/
 GUPnPServiceProxy *
 gupnp_resource_factory_create_service_proxy
@@ -318,7 +318,7 @@ gupnp_resource_factory_create_service_proxy
  * Create a #GUPnPDevice for the device with element @element, as
  * read from the device description file specified by @location.
  *
- * Return value: A new #GUPnPDevice.
+ * Return value: (nullable)(transfer full): A new #GUPnPDevice.
  **/
 GUPnPDevice *
 gupnp_resource_factory_create_device
@@ -374,7 +374,7 @@ gupnp_resource_factory_create_device
  * Create a #GUPnPService for the service with element @element, as
  * read from the service description file specified by @location.
  *
- * Return value: A new #GUPnPService.
+ * Return value: (nullable)(transfer full): A new #GUPnPService.
  **/
 GUPnPService *
 gupnp_resource_factory_create_service
diff --git a/libgupnp/gupnp-root-device.c b/libgupnp/gupnp-root-device.c
index 2a26540..7ffe390 100644
--- a/libgupnp/gupnp-root-device.c
+++ b/libgupnp/gupnp-root-device.c
@@ -563,7 +563,7 @@ gupnp_root_device_class_init (GUPnPRootDeviceClass *klass)
  * @description_path: Path to device description document. This could either
  * be an absolute path or path relative to @description_dir.
  * @description_dir: Path to directory where description documents are provided.
- * @error: (allow-none): The location for a #GError to report issue with
+ * @error: (inout)(optional)(nullable): The location for a #GError to report issue with
  * creation on or %NULL.
  *
  * Create a new #GUPnPRootDevice object, automatically loading and parsing
@@ -597,7 +597,7 @@ gupnp_root_device_new (GUPnPContext *context,
  * @description_path: Path to device description document. This could either
  * be an absolute path or path relative to @description_dir.
  * @description_dir: Path to directory where description documents are provided.
- * @error: (allow-none): The location for a #GError to report issue with
+ * @error: (inout)(optional)(nullable): The location for a #GError to report issue with
  * creation on or %NULL.
  *
  * Create a new #GUPnPRootDevice, automatically loading and parsing
diff --git a/libgupnp/gupnp-service-info.c b/libgupnp/gupnp-service-info.c
index 5c65cd2..4f2c3c8 100644
--- a/libgupnp/gupnp-service-info.c
+++ b/libgupnp/gupnp-service-info.c
@@ -828,7 +828,7 @@ prv_introspection_cb (GUPnPServiceInfo *info,
 /**
  * gupnp_service_info_introspect_async:
  * @info: A #GUPnPServiceInfo
- * @cancellable: (allow-none) : #GCancellable that can be used to cancel the call, or %NULL.
+ * @cancellable: (nullable) : #GCancellable that can be used to cancel the call, or %NULL.
  * @callback: (scope async) : callback to be called when introspeciton object is ready.
  * @user_data: user_data to be passed to the callback.
  *
@@ -860,12 +860,12 @@ gupnp_service_info_introspect_async           (GUPnPServiceInfo    *info,
  * gupnp_service_info_introspect_finish:
  * @info: A GUPnPServiceInfo
  * @res: A #GAsyncResult
- * @error: (allow-none): Return location for a #GError, or %NULL
+ * @error: (inout)(optional)(nullable): Return location for a #GError, or %NULL
  *
  * Finish an asynchronous call initiated with
  * gupnp_service_info_introspect_async().
  *
- * Returns: (transfer full): %NULL, if the call had an error, a
+ * Returns: (nullable)(transfer full): %NULL, if the call had an error, a
  * #GUPnPServiceIntrospection object otherwise.
  *
  * Since: 1.2.2
diff --git a/libgupnp/gupnp-service-introspection.c b/libgupnp/gupnp-service-introspection.c
index cfd28d2..e74c508 100644
--- a/libgupnp/gupnp-service-introspection.c
+++ b/libgupnp/gupnp-service-introspection.c
@@ -897,7 +897,7 @@ state_variable_search_func (GUPnPServiceStateVariableInfo *variable,
  *
  * Returns the state variable by the name @variable_name in this service.
  *
- * Return value: (transfer none)(allow-none): the state variable or %NULL. Do not modify or
+ * Return value: (transfer none)(nullable): the state variable or %NULL. Do not modify or
  * free it.
  **/
 const GUPnPServiceStateVariableInfo *
@@ -937,7 +937,7 @@ action_search_func (GUPnPServiceActionInfo *action,
  *
  * Returns the action by the name @action_name in this service.
  *
- * Return value: (transfer none)(allow-none): the action or %NULL. Do not modify or free
+ * Return value: (transfer none)(nullable): the action or %NULL. Do not modify or free
  * it.
  **/
 const GUPnPServiceActionInfo *
diff --git a/libgupnp/gupnp-service-proxy-action.c b/libgupnp/gupnp-service-proxy-action.c
index 23ba2f6..8449679 100644
--- a/libgupnp/gupnp-service-proxy-action.c
+++ b/libgupnp/gupnp-service-proxy-action.c
@@ -438,7 +438,7 @@ gupnp_service_proxy_action_new_from_list (const char *action_name,
  * that line up with @out_names
  * @out_values: (element-type GValue) (transfer full) (out): #GList of values
  * (as #GValue) that line up with @out_names and @out_types.
- * @error: The location where to store any error, or %NULL
+ * @error:(inout)(optional)(nullable): The location where to store any error, or %NULL
  *
  * A variant of gupnp_service_proxy_action_get_result() that takes lists of
  * out-parameter names, types and place-holders for values. The returned list
@@ -558,7 +558,7 @@ gupnp_service_proxy_action_get_result_list (GUPnPServiceProxyAction *action,
  * @action: A #GUPnPServiceProxyAction handle
  * @out_hash: (element-type utf8 GValue) (inout) (transfer none): A #GHashTable of
  * out parameter name and initialised #GValue pairs
- * @error: The location where to store any error, or %NULL
+ * @error:(inout)(optional)(nullable): The location where to store any error, or %NULL
  *
  * See gupnp_service_proxy_action_get_result(); this version takes a #GHashTable for
  * runtime generated parameter lists.
@@ -650,7 +650,7 @@ gupnp_service_proxy_action_get_result_hash (GUPnPServiceProxyAction *action,
 /**
  * gupnp_service_proxy_action_get_result:
  * @action: A #GUPnPServiceProxyAction handle
- * @error: (allow-none): The location where to store any error, or %NULL
+ * @error: (inout)(optional)(nullable): The location where to store any error, or %NULL
  * @...: tuples of out parameter name, out parameter type, and out parameter
  * value location, terminated with %NULL. The out parameter values should be
  * freed after use
@@ -681,7 +681,7 @@ gupnp_service_proxy_action_get_result (GUPnPServiceProxyAction *action,
 /**
  * gupnp_service_proxy_action_get_result_valist:
  * @action: A #GUPnPServiceProxyAction handle
- * @error: (allow-none): The location where to store any error, or %NULL
+ * @error: (inout)(optional)(nullable): The location where to store any error, or %NULL
  * @var_args: A va_list of tuples of out parameter name, out parameter type,
  * and out parameter value location. The out parameter values should be
  * freed after use
diff --git a/libgupnp/gupnp-service-proxy.c b/libgupnp/gupnp-service-proxy.c
index 71af514..91efc3f 100644
--- a/libgupnp/gupnp-service-proxy.c
+++ b/libgupnp/gupnp-service-proxy.c
@@ -380,7 +380,7 @@ gupnp_service_proxy_class_init (GUPnPServiceProxyClass *klass)
  * gupnp_service_proxy_send_action:
  * @proxy: A #GUPnPServiceProxy
  * @action: An action
- * @error: (allow-none): The location where to store any error, or %NULL
+ * @error: (inout)(optional)(nullable): The location where to store any error, or %NULL
  * @...: tuples of in parameter name, in parameter type, and in parameter
  * value, followed by %NULL, and then tuples of out parameter name,
  * out parameter type, and out parameter value location, terminated with %NULL
@@ -419,7 +419,7 @@ gupnp_service_proxy_send_action (GUPnPServiceProxy *proxy,
  * gupnp_service_proxy_send_action_valist:
  * @proxy: A #GUPnPServiceProxy
  * @action: An action
- * @error: (allow-none): The location where to store any error, or %NULL
+ * @error: (inout)(optional)(nullable): The location where to store any error, or %NULL
  * @var_args: va_list of tuples of in parameter name, in parameter type, and in
  * parameter value, followed by %NULL, and then tuples of out parameter name,
  * out parameter type, and out parameter value location
@@ -495,7 +495,7 @@ out:
  * that line up with @out_names
  * @out_values: (element-type GValue) (transfer full) (out): #GList of values
  * (as #GValue) that line up with @out_names and @out_types.
- * @error: (allow-none): The location where to store any error, or %NULL
+ * @error: (inout)(optional)(nullable): The location where to store any error, or %NULL
  *
  * The synchronous variant of #gupnp_service_proxy_begin_action_list and
  * #gupnp_service_proxy_end_action_list.
@@ -920,7 +920,7 @@ gupnp_service_proxy_begin_action_list
  * gupnp_service_proxy_end_action:
  * @proxy: A #GUPnPServiceProxy
  * @action: A #GUPnPServiceProxyAction handle
- * @error: (allow-none): The location where to store any error, or %NULL
+ * @error: (inout)(optional)(nullable): The location where to store any error, or %NULL
  * @...: tuples of out parameter name, out parameter type, and out parameter
  * value location, terminated with %NULL. The out parameter values should be
  * freed after use
@@ -965,7 +965,7 @@ gupnp_service_proxy_end_action (GUPnPServiceProxy       *proxy,
  * gupnp_service_proxy_end_action_valist:
  * @proxy: A #GUPnPServiceProxy
  * @action: A #GUPnPServiceProxyAction handle
- * @error: (allow-none): The location where to store any error, or %NULL
+ * @error: (inout)(optional)(nullable): The location where to store any error, or %NULL
  * @var_args: A va_list of tuples of out parameter name, out parameter type,
  * and out parameter value location. The out parameter values should be
  * freed after use
@@ -1005,7 +1005,7 @@ gupnp_service_proxy_end_action_valist (GUPnPServiceProxy       *proxy,
  * gupnp_service_proxy_end_action_list:
  * @proxy: A #GUPnPServiceProxy
  * @action: A #GUPnPServiceProxyAction handle
- * @error: The location where to store any error, or %NULL
+ * @error:(inout)(optional)(nullable): The location where to store any error, or %NULL
  * @out_names: (element-type utf8) (transfer none): #GList of 'out' parameter
  * names (as strings)
  * @out_types: (element-type GType) (transfer none): #GList of types (as #GType)
@@ -1057,7 +1057,7 @@ gupnp_service_proxy_end_action_list (GUPnPServiceProxy       *proxy,
  * gupnp_service_proxy_end_action_hash:
  * @proxy: A #GUPnPServiceProxy
  * @action: A #GUPnPServiceProxyAction handle
- * @error: The location where to store any error, or %NULL
+ * @error:(inout)(optional)(nullable): The location where to store any error, or %NULL
  * @hash: (element-type utf8 GValue) (inout) (transfer none): A #GHashTable of
  * out parameter name and initialised #GValue pairs
  *
@@ -2115,7 +2115,7 @@ gupnp_service_proxy_call_action_async (GUPnPServiceProxy       *proxy,
  * gupnp_service_proxy_call_action_finish:
  * @proxy: a #GUPnPServiceProxy
  * @result: a #GAsyncResult
- * @error: (allow-none): Return location for a #GError, or %NULL
+ * @error: (inout)(optional)(nullable): Return location for a #GError, or %NULL
  *
  * Finish an asynchronous call initiated with
  * gupnp_service_proxy_call_action_async().
@@ -2139,7 +2139,7 @@ gupnp_service_proxy_call_action_finish (GUPnPServiceProxy *proxy,
  * @action: (transfer none): An action
  * @cancellable: (allow-none): A #GCancellable which can be used to cancel the
  * current action call
- * @error: (allow-none): Return location for a #GError, or %NULL.
+ * @error: (inout)(optional)(nullable): Return location for a #GError, or %NULL.
  *
  * Synchronously call the @action on the remote UPnP service.
  *
diff --git a/libgupnp/gupnp-service.c b/libgupnp/gupnp-service.c
index ff70fc8..f11de03 100644
--- a/libgupnp/gupnp-service.c
+++ b/libgupnp/gupnp-service.c
@@ -2315,7 +2315,7 @@ connect_names_to_signal_handlers (GUPnPService *service,
  * gupnp_service_signals_autoconnect:
  * @service: A #GUPnPService
  * @user_data: the data to pass to each of the callbacks
- * @error: return location for a #GError, or %NULL
+ * @error: (inout)(optional)(nullable): return location for a #GError, or %NULL
  *
  * A convenience function that attempts to connect all possible
  * #GUPnPService::action-invoked and #GUPnPService::query-variable signals to
diff --git a/libgupnp/gupnp-white-list.c b/libgupnp/gupnp-white-list.c
index bfe48bd..510ca22 100644
--- a/libgupnp/gupnp-white-list.c
+++ b/libgupnp/gupnp-white-list.c
@@ -368,7 +368,7 @@ gupnp_white_list_remove_entry (GUPnPWhiteList *white_list, const gchar* entry)
  *
  * Get the #GList of entries that compose the white list. Do not free
  *
- * Return value: (element-type utf8) (transfer none):  a #GList of entries
+ * Return value: (nullable)(element-type utf8) (transfer none):  a #GList of entries
  * used to filter networks, interfaces,... or %NULL.
  * Do not modify or free the list nor its elements.
  *
diff --git a/libgupnp/gupnp-xml-doc.c b/libgupnp/gupnp-xml-doc.c
index 0155ea4..c3bf075 100644
--- a/libgupnp/gupnp-xml-doc.c
+++ b/libgupnp/gupnp-xml-doc.c
@@ -107,7 +107,7 @@ gupnp_xml_doc_new (xmlDoc *xml_doc)
 /**
  * gupnp_xml_doc_new_from_path:
  * @path: Path to xml document
- * @error:(optional): Location to put the error into
+ * @error:(inout)(optional)(nullable): Location to put the error into
  *
  * Create a new #GUPnPXMLDoc for the XML document at @path.
  *