Cypher_Stack/libsecret
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libsecret.git synced 2024-12-22 04:38:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of (allow-none) annotations

Browse Source 
The `(allow-none)` annotation was deprecated for `(nullable)` and
`(optional)` to solve some ambiguous uses of the tag.
This commit is contained in:
Niels De Graef 2021-02-06 10:08:48 +01:00
parent e7214fa161
commit 402c9fb7fd
8 changed files with 113 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libsecret/secret-collection.c
View File

@ -1057,9 +1057,9 @@ _secret_collection_properties_new (const gchar *label)
/**
* secret_collection_create:
* @service: (allow-none): a secret service object
* @service: (nullable): a secret service object
* @label: label for the new collection
* @alias: (allow-none): alias to assign to the collection
* @alias: (nullable): alias to assign to the collection
* @flags: currently unused
* @cancellable: optional cancellation object
* @callback: called when the operation completes
@ -1155,9 +1155,9 @@ secret_collection_create_finish (GAsyncResult *result,
/**
* secret_collection_create_sync:
* @service: (allow-none): a secret service object
* @service: (nullable): a secret service object
* @label: label for the new collection
* @alias: (allow-none): alias to assign to the collection
* @alias: (nullable): alias to assign to the collection
* @flags: currently unused
* @cancellable: optional cancellation object
* @error: location to place an error on failure
@ -1397,7 +1397,7 @@ on_search_paths (GObject *source,
/**
* secret_collection_search:
* @self: a secret collection
* @schema: (allow-none): the schema for the attributes
* @schema: (nullable): the schema for the attributes
* @attributes: (element-type utf8 utf8): search for items matching these attributes
* @flags: search option flags
* @cancellable: optional cancellation object
@ -1531,7 +1531,7 @@ collection_load_items_sync (SecretCollection *self,
/**
* secret_collection_search_sync:
* @self: a secret collection
* @schema: (allow-none): the schema for the attributes
* @schema: (nullable): the schema for the attributes
* @attributes: (element-type utf8 utf8): search for items matching these attributes
* @flags: search option flags
* @cancellable: optional cancellation object
@ -2104,10 +2104,10 @@ on_read_alias_service (GObject *source,
/**
* secret_collection_for_alias:
* @service: (allow-none): a secret service object
* @service: (nullable): a secret service object
* @alias: the alias to lookup
* @flags: options for the collection initialization
* @cancellable: (allow-none): optional cancellation object
* @cancellable: (nullable): optional cancellation object
* @callback: called when the operation completes
* @user_data: data to pass to the callback
*
@ -2185,10 +2185,10 @@ secret_collection_for_alias_finish (GAsyncResult *result,
/**
* secret_collection_for_alias_sync:
* @service: (allow-none): a secret service object
* @service: (nullable): a secret service object
* @alias: the alias to lookup
* @flags: options for the collection initialization
* @cancellable: (allow-none): optional cancellation object
* @cancellable: (nullable): optional cancellation object
* @error: location to place error on failure
*
* Lookup which collection is assigned to this alias. Aliases help determine

10
libsecret/secret-item.c
View File

@ -718,7 +718,7 @@ item_properties_new (const gchar *label,
/**
* secret_item_create:
* @collection: a secret collection to create this item in
* @schema: (allow-none): the schema for the attributes
* @schema: (nullable): the schema for the attributes
* @attributes: (element-type utf8 utf8): attributes for the new item
* @label: label for the new item
* @value: secret value for the new item
@ -813,7 +813,7 @@ secret_item_create_finish (GAsyncResult *result,
/**
* secret_item_create_sync:
* @collection: a secret collection to create this item in
* @schema: (allow-none): the schema for the attributes
* @schema: (nullable): the schema for the attributes
* @attributes: (element-type utf8 utf8): attributes for the new item
* @label: label for the new item
* @value: secret value for the new item
@ -1057,7 +1057,7 @@ secret_item_get_service (SecretItem *self)
*
* To load the secret call the secret_item_load_secret() method.
*
* Returns: (transfer full) (allow-none): the secret value which should be
* Returns: (transfer full) (nullable): the secret value which should be
* released with secret_value_unref(), or %NULL
*/
SecretValue *
@ -1756,7 +1756,7 @@ secret_item_get_attributes (SecretItem *self)
/**
* secret_item_set_attributes:
* @self: an item
* @schema: (allow-none): the schema for the attributes
* @schema: (nullable): the schema for the attributes
* @attributes: (element-type utf8 utf8): a new set of attributes
* @cancellable: optional cancellation object
* @callback: called when the asynchronous operation completes
@ -1820,7 +1820,7 @@ secret_item_set_attributes_finish (SecretItem *self,
/**
* secret_item_set_attributes_sync:
* @self: an item
* @schema: (allow-none): the schema for the attributes
* @schema: (nullable): the schema for the attributes
* @attributes: (element-type utf8 utf8): a new set of attributes
* @cancellable: optional cancellation object
* @error: location to place error on failure

80
libsecret/secret-methods.c
View File

@ -259,8 +259,8 @@ on_search_service (GObject *source,
/**
* secret_service_search:
* @service: (allow-none): the secret service
* @schema: (allow-none): the schema for the attributes
* @service: (nullable): the secret service
* @schema: (nullable): the schema for the attributes
* @attributes: (element-type utf8 utf8): search for items matching these attributes
* @flags: search option flags
* @cancellable: optional cancellation object
@ -336,7 +336,7 @@ secret_service_search (SecretService *service,
/**
* secret_service_search_finish:
* @service: (allow-none): the secret service
* @service: (nullable): the secret service
* @result: asynchronous result passed to callback
* @error: location to place error on failure
*
@ -403,8 +403,8 @@ service_load_items_sync (SecretService *service,
/**
* secret_service_search_sync:
* @service: (allow-none): the secret service
* @schema: (allow-none): the schema for the attributes
* @service: (nullable): the secret service
* @schema: (nullable): the schema for the attributes
* @attributes: (element-type utf8 utf8): search for items matching these attributes
* @flags: search option flags
* @cancellable: optional cancellation object
@ -726,7 +726,7 @@ service_xlock_finish (SecretService *service,
/**
* secret_service_lock:
* @service: (allow-none): the secret service
* @service: (nullable): the secret service
* @objects: (element-type Gio.DBusProxy): the items or collections to lock
* @cancellable: optional cancellation object
* @callback: called when the operation completes
@ -759,9 +759,9 @@ secret_service_lock (SecretService *service,
/**
* secret_service_lock_finish:
* @service: (allow-none): the secret service
* @service: (nullable): the secret service
* @result: asynchronous result passed to the callback
* @locked: (out) (element-type Gio.DBusProxy) (transfer full) (allow-none):
* @locked: (out) (element-type Gio.DBusProxy) (transfer full) (nullable) (optional):
* location to place list of items or collections that were locked
* @error: location to place an error on failure
*
@ -787,10 +787,10 @@ secret_service_lock_finish (SecretService *service,
/**
* secret_service_lock_sync:
* @service: (allow-none): the secret service
* @service: (nullable): the secret service
* @objects: (element-type Gio.DBusProxy): the items or collections to lock
* @cancellable: optional cancellation object
* @locked: (out) (element-type Gio.DBusProxy) (transfer full) (allow-none):
* @locked: (out) (element-type Gio.DBusProxy) (transfer full) (nullable) (optional):
* location to place list of items or collections that were locked
* @error: location to place an error on failure
*
@ -840,7 +840,7 @@ secret_service_lock_sync (SecretService *service,
/**
* secret_service_unlock:
* @service: (allow-none): the secret service
* @service: (nullable): the secret service
* @objects: (element-type Gio.DBusProxy): the items or collections to unlock
* @cancellable: optional cancellation object
* @callback: called when the operation completes
@ -873,9 +873,9 @@ secret_service_unlock (SecretService *service,
/**
* secret_service_unlock_finish:
* @service: (allow-none): the secret service
* @service: (nullable): the secret service
* @result: asynchronous result passed to the callback
* @unlocked: (out) (element-type Gio.DBusProxy) (transfer full) (allow-none):
* @unlocked: (out) (element-type Gio.DBusProxy) (transfer full) (nullable) (optional):
* location to place list of items or collections that were unlocked
* @error: location to place an error on failure
*
@ -901,10 +901,10 @@ secret_service_unlock_finish (SecretService *service,
/**
* secret_service_unlock_sync:
* @service: (allow-none): the secret service
* @service: (nullable): the secret service
* @objects: (element-type Gio.DBusProxy): the items or collections to unlock
* @cancellable: optional cancellation object
* @unlocked: (out) (element-type Gio.DBusProxy) (transfer full) (allow-none):
* @unlocked: (out) (element-type Gio.DBusProxy) (transfer full) (nullable) (optional):
* location to place list of items or collections that were unlocked
* @error: location to place an error on failure
*
@ -1102,10 +1102,11 @@ on_store_service (GObject *source,
/**
* secret_service_store:
* @service: (allow-none): the secret service
* @schema: (allow-none): the schema to use to check attributes
* @service: (nullable): the secret service
* @schema: (nullable): the schema to use to check attributes
* @attributes: (element-type utf8 utf8): the attribute keys and values
* @collection: (allow-none): a collection alias, or D-Bus object path of the collection where to store the secret
* @collection: (nullable): a collection alias, or D-Bus object path of the
* collection where to store the secret
* @label: label for the secret
* @value: the secret value
* @cancellable: optional cancellation object
@ -1193,7 +1194,7 @@ secret_service_store (SecretService *service,
/**
* secret_service_store_finish:
* @service: (allow-none): the secret service
* @service: (nullable): the secret service
* @result: the asynchronous result passed to the callback
* @error: location to place an error on failure
*
@ -1219,10 +1220,11 @@ secret_service_store_finish (SecretService *service,
/**
* secret_service_store_sync:
* @service: (allow-none): the secret service
* @schema: (allow-none): the schema for the attributes
* @service: (nullable): the secret service
* @schema: (nullable): the schema for the attributes
* @attributes: (element-type utf8 utf8): the attribute keys and values
* @collection: (allow-none): a collection alias, or D-Bus object path of the collection where to store the secret
* @collection: (nullable): a collection alias, or D-Bus object path of the
* collection where to store the secret
* @label: label for the secret
* @value: the secret value
* @cancellable: optional cancellation object
@ -1419,8 +1421,8 @@ on_lookup_service (GObject *source,
/**
* secret_service_lookup:
* @service: (allow-none): the secret service
* @schema: (allow-none): the schema for the attributes
* @service: (nullable): the secret service
* @schema: (nullable): the schema for the attributes
* @attributes: (element-type utf8 utf8): the attribute keys and values
* @cancellable: optional cancellation object
* @callback: called when the operation completes
@ -1480,7 +1482,7 @@ secret_service_lookup (SecretService *service,
/**
* secret_service_lookup_finish:
* @service: (allow-none): the secret service
* @service: (nullable): the secret service
* @result: the asynchronous result passed to the callback
* @error: location to place an error on failure
*
@ -1517,8 +1519,8 @@ secret_service_lookup_finish (SecretService *service,
/**
* secret_service_lookup_sync:
* @service: (allow-none): the secret service
* @schema: (allow-none): the schema for the attributes
* @service: (nullable): the secret service
* @schema: (nullable): the schema for the attributes
* @attributes: (element-type utf8 utf8): the attribute keys and values
* @cancellable: optional cancellation object
* @error: location to place an error on failure
@ -1670,8 +1672,8 @@ on_delete_service (GObject *source,
/**
* secret_service_clear:
* @service: (allow-none): the secret service
* @schema: (allow-none): the schema for the attributes
* @service: (nullable): the secret service
* @schema: (nullable): the schema for the attributes
* @attributes: (element-type utf8 utf8): the attribute keys and values
* @cancellable: optional cancellation object
* @callback: called when the operation completes
@ -1735,7 +1737,7 @@ secret_service_clear (SecretService *service,
/**
* secret_service_clear_finish:
* @service: (allow-none): the secret service
* @service: (nullable): the secret service
* @result: the asynchronous result passed to the callback
* @error: location to place an error on failure
*
@ -1767,8 +1769,8 @@ secret_service_clear_finish (SecretService *service,
/**
* secret_service_clear_sync:
* @service: (allow-none): the secret service
* @schema: (allow-none): the schema for the attributes
* @service: (nullable): the secret service
* @schema: (nullable): the schema for the attributes
* @attributes: (element-type utf8 utf8): the attribute keys and values
* @cancellable: optional cancellation object
* @error: location to place an error on failure
@ -1881,10 +1883,10 @@ on_set_alias_service (GObject *source,
/**
* secret_service_set_alias:
* @service: (allow-none): a secret service object
* @service: (nullable): a secret service object
* @alias: the alias to assign the collection to
* @collection: (allow-none): the collection to assign to the alias
* @cancellable: (allow-none): optional cancellation object
* @collection: (nullable): the collection to assign to the alias
* @cancellable: (nullable): optional cancellation object
* @callback: called when the operation completes
* @user_data: data to pass to the callback
*
@ -1945,7 +1947,7 @@ secret_service_set_alias (SecretService *service,
/**
* secret_service_set_alias_finish:
* @service: (allow-none): a secret service object
* @service: (nullable): a secret service object
* @result: asynchronous result passed to callback
* @error: location to place error on failure
*
@ -1971,10 +1973,10 @@ secret_service_set_alias_finish (SecretService *service,
/**
* secret_service_set_alias_sync:
* @service: (allow-none): a secret service object
* @service: (nullable): a secret service object
* @alias: the alias to assign the collection to
* @collection: (allow-none): the collection to assign to the alias
* @cancellable: (allow-none): optional cancellation object
* @collection: (nullable): the collection to assign to the alias
* @cancellable: (nullable): optional cancellation object
* @error: location to place error on failure
*
* Assign a collection to this alias. Aliases help determine

28
libsecret/secret-password.c
View File

@ -47,7 +47,8 @@
/**
* secret_password_store: (skip)
* @schema: the schema for attributes
* @collection: (allow-none): a collection alias, or D-Bus object path of the collection where to store the secret
* @collection: (nullable): a collection alias, or D-Bus object path of the
* collection where to store the secret
* @label: label for the secret
* @password: the null-terminated password to store
* @cancellable: optional cancellation object
@ -178,7 +179,8 @@ on_store_backend (GObject *source,
* secret_password_storev: (rename-to secret_password_store)
* @schema: (nullable): the schema for attributes
* @attributes: (element-type utf8 utf8) (transfer full): the attribute keys and values
* @collection: (allow-none): a collection alias, or D-Bus object path of the collection where to store the secret
* @collection: (nullable): a collection alias, or D-Bus object path of the
* collection where to store the secret
* @label: label for the secret
* @password: the null-terminated password to store
* @cancellable: optional cancellation object
@ -237,7 +239,8 @@ secret_password_storev (const SecretSchema *schema,
/**
* secret_password_store_binary: (skip)
* @schema: the schema for attributes
* @collection: (allow-none): a collection alias, or D-Bus object path of the collection where to store the secret
* @collection: (nullable): a collection alias, or D-Bus object path of the
* collection where to store the secret
* @label: label for the secret
* @value: a #SecretValue
* @cancellable: optional cancellation object
@ -290,7 +293,8 @@ secret_password_store_binary (const SecretSchema *schema,
* secret_password_storev_binary: (rename-to secret_password_store_binary)
* @schema: (nullable): the schema for attributes
* @attributes: (element-type utf8 utf8) (transfer full): the attribute keys and values
* @collection: (allow-none): a collection alias, or D-Bus object path of the collection where to store the secret
* @collection: (nullable): a collection alias, or D-Bus object path of the
* collection where to store the secret
* @label: label for the secret
* @value: a #SecretValue
* @cancellable: optional cancellation object
@ -364,7 +368,8 @@ secret_password_store_finish (GAsyncResult *result,
/**
* secret_password_store_sync:
* @schema: the schema for attributes
* @collection: (allow-none): a collection alias, or D-Bus object path of the collection where to store the secret
* @collection: (nullable): a collection alias, or D-Bus object path of the
* collection where to store the secret
* @label: label for the secret
* @password: the null-terminated password to store
* @cancellable: optional cancellation object
@ -428,7 +433,8 @@ secret_password_store_sync (const SecretSchema *schema,
* secret_password_storev_sync: (rename-to secret_password_store_sync)
* @schema: (nullable): the schema for attributes
* @attributes: (element-type utf8 utf8): the attribute keys and values
* @collection: (allow-none): a collection alias, or D-Bus object path of the collection where to store the secret
* @collection: (nullable): a collection alias, or D-Bus object path of the
* collection where to store the secret
* @label: label for the secret
* @password: the null-terminated password to store
* @cancellable: optional cancellation object
@ -491,7 +497,8 @@ secret_password_storev_sync (const SecretSchema *schema,
/**
* secret_password_store_binary_sync:
* @schema: the schema for attributes
* @collection: (allow-none): a collection alias, or D-Bus object path of the collection where to store the secret
* @collection: (nullable): a collection alias, or D-Bus object path of the
* collection where to store the secret
* @label: label for the secret
* @value: a #SecretValue
* @cancellable: optional cancellation object
@ -548,7 +555,8 @@ secret_password_store_binary_sync (const SecretSchema *schema,
* secret_password_storev_binary_sync: (rename-to secret_password_store_binary_sync)
* @schema: (nullable): the schema for attributes
* @attributes: (element-type utf8 utf8): the attribute keys and values
* @collection: (allow-none): a collection alias, or D-Bus object path of the collection where to store the secret
* @collection: (nullable): a collection alias, or D-Bus object path of the
* collection where to store the secret
* @label: label for the secret
* @value: a #SecretValue
* @cancellable: optional cancellation object
@ -1733,7 +1741,7 @@ secret_password_searchv_sync (const SecretSchema *schema,
/**
* secret_password_free: (skip)
* @password: (allow-none): password to free
* @password: (nullable): password to free
*
* Clear the memory used by a password, and then free it.
*
@ -1753,7 +1761,7 @@ secret_password_free (gchar *password)
/**
* secret_password_wipe:
* @password: (allow-none): password to clear
* @password: (nullable): password to clear
*
* Clear the memory used by a password.
*/

57
libsecret/secret-paths.c
View File

@ -41,7 +41,7 @@
/**
* secret_collection_new_for_dbus_path: (skip)
* @service: (allow-none): a secret service object
* @service: (nullable): a secret service object
* @collection_path: the D-Bus path of the collection
* @flags: options for the collection initialization
* @cancellable: optional cancellation object
@ -120,7 +120,7 @@ secret_collection_new_for_dbus_path_finish (GAsyncResult *result,
/**
* secret_collection_new_for_dbus_path_sync: (skip)
* @service: (allow-none): a secret service object
* @service: (nullable): a secret service object
* @collection_path: the D-Bus path of the collection
* @flags: options for the collection initialization
* @cancellable: optional cancellation object
@ -170,7 +170,7 @@ secret_collection_new_for_dbus_path_sync (SecretService *service,
/**
* secret_item_new_for_dbus_path: (skip)
* @service: (allow-none): a secret service object
* @service: (nullable): a secret service object
* @item_path: the D-Bus path of the collection
* @flags: initialization flags for the new item
* @cancellable: optional cancellation object
@ -248,7 +248,7 @@ secret_item_new_for_dbus_path_finish (GAsyncResult *result,
/**
* secret_item_new_for_dbus_path_sync: (skip)
* @service: (allow-none): a secret service object
* @service: (nullable): a secret service object
* @item_path: the D-Bus path of the item
* @flags: initialization flags for the new item
* @cancellable: optional cancellation object
@ -320,7 +320,7 @@ on_search_items_complete (GObject *source,
/**
* secret_collection_search_for_dbus_paths: (skip)
* @collection: the secret collection
* @schema: (allow-none): the schema for the attributes
* @schema: (nullable): the schema for the attributes
* @attributes: (element-type utf8 utf8): search for items matching these attributes
* @cancellable: optional cancellation object
* @callback: called when the operation completes
@ -416,7 +416,7 @@ secret_collection_search_for_dbus_paths_finish (SecretCollection *collection,
/**
* secret_collection_search_for_dbus_paths_sync: (skip)
* @collection: the secret collection
* @schema: (allow-none): the schema for the attributes
* @schema: (nullable): the schema for the attributes
* @attributes: (element-type utf8 utf8): search for items matching these attributes
* @cancellable: optional cancellation object
* @error: location to place error on failure
@ -471,7 +471,7 @@ secret_collection_search_for_dbus_paths_sync (SecretCollection *collection,
/**
* secret_service_search_for_dbus_paths: (skip)
* @self: the secret service
* @schema: (allow-none): the schema for the attributes
* @schema: (nullable): the schema for the attributes
* @attributes: (element-type utf8 utf8): search for items matching these attributes
* @cancellable: optional cancellation object
* @callback: called when the operation completes
@ -543,10 +543,10 @@ _secret_service_search_for_paths_variant (SecretService *self,
* secret_service_search_for_dbus_paths_finish: (skip)
* @self: the secret service
* @result: asynchronous result passed to callback
* @unlocked: (out) (transfer full) (array zero-terminated=1) (allow-none):
* @unlocked: (out) (transfer full) (array zero-terminated=1) (optional) (nullable):
* location to place an array of D-Bus object paths for matching
* items which were locked.
* @locked: (out) (transfer full) (array zero-terminated=1) (allow-none):
* @locked: (out) (transfer full) (array zero-terminated=1) (optional) (nullable):
* location to place an array of D-Bus object paths for matching
* items which were locked.
* @error: location to place error on failure
@ -604,13 +604,13 @@ secret_service_search_for_dbus_paths_finish (SecretService *self,
/**
* secret_service_search_for_dbus_paths_sync: (skip)
* @self: the secret service
* @schema: (allow-none): the schema for the attributes
* @schema: (nullable): the schema for the attributes
* @attributes: (element-type utf8 utf8): search for items matching these attributes
* @cancellable: optional cancellation object
* @unlocked: (out) (transfer full) (array zero-terminated=1) (allow-none):
* @unlocked: (out) (transfer full) (array zero-terminated=1) (optional) (nullable):
* location to place an array of D-Bus object paths for matching
* items which were locked.
* @locked: (out) (transfer full) (array zero-terminated=1) (allow-none):
* @locked: (out) (transfer full) (array zero-terminated=1) (optional) (nullable):
* location to place an array of D-Bus object paths for matching
* items which were locked.
* @error: location to place error on failure
@ -783,7 +783,7 @@ secret_service_get_secret_for_dbus_path (SecretService *self,
*
* Stability: Unstable
*
* Returns: (transfer full) (allow-none): the newly allocated secret value
* Returns: (transfer full) (nullable): the newly allocated secret value
* for the item, which should be released with secret_value_unref()
*/
SecretValue *
@ -828,7 +828,7 @@ secret_service_get_secret_for_dbus_path_finish (SecretService *self,
*
* Stability: Unstable
*
* Returns: (transfer full) (allow-none): the newly allocated secret value
* Returns: (transfer full) (nullable): the newly allocated secret value
* for the item, which should be released with secret_value_unref()
*/
SecretValue *
@ -1150,7 +1150,7 @@ _secret_service_xlock_paths_finish (SecretService *self,
* @self: the secret service
* @paths: (array zero-terminated=1): the D-Bus object paths of the items or collections to lock
* @cancellable: optional cancellation object
* @locked: (out) (array zero-terminated=1) (transfer full) (allow-none):
* @locked: (out) (array zero-terminated=1) (transfer full) (optional) (nullable):
* location to place array of D-Bus paths of items or collections
* that were locked
* @error: location to place an error on failure
@ -1246,7 +1246,7 @@ secret_service_lock_dbus_paths (SecretService *self,
* secret_service_lock_dbus_paths_finish: (skip)
* @self: the secret service
* @result: asynchronous result passed to the callback
* @locked: (out) (array zero-terminated=1) (transfer full) (allow-none):
* @locked: (out) (array zero-terminated=1) (transfer full) (optional) (nullable):
* location to place array of D-Bus paths of items or collections
* that were locked
* @error: location to place an error on failure
@ -1280,7 +1280,7 @@ secret_service_lock_dbus_paths_finish (SecretService *self,
* @paths: (array zero-terminated=1): the D-Bus object paths of the items or
* collections to unlock
* @cancellable: optional cancellation object
* @unlocked: (out) (array zero-terminated=1) (transfer full) (allow-none):
* @unlocked: (out) (array zero-terminated=1) (transfer full) (optional) (nullable):
* location to place array of D-Bus paths of items or collections
* that were unlocked
* @error: location to place an error on failure
@ -1378,7 +1378,7 @@ secret_service_unlock_dbus_paths (SecretService *self,
* secret_service_unlock_dbus_paths_finish: (skip)
* @self: the secret service
* @result: asynchronous result passed to the callback
* @unlocked: (out) (array zero-terminated=1) (transfer full) (allow-none):
* @unlocked: (out) (array zero-terminated=1) (transfer full) (optional) (nullable):
* location to place array of D-Bus paths of items or collections
* that were unlocked
* @error: location to place an error on failure
@ -1705,7 +1705,7 @@ on_create_collection_called (GObject *source,
* @self: a secret service object
* @properties: (element-type utf8 GLib.Variant): hash table of properties for
* the new collection
* @alias: (allow-none): an alias to check for before creating the new
* @alias: (nullable): an alias to check for before creating the new
* collection, or to assign to the new collection
* @flags: not currently used
* @cancellable: optional cancellation object
@ -1822,7 +1822,7 @@ secret_service_create_collection_dbus_path_finish (SecretService *self,
* @self: a secret service object
* @properties: (element-type utf8 GLib.Variant): hash table of D-Bus properties
* for the new collection
* @alias: (allow-none): an alias to check for before creating the new
* @alias: (nullable): an alias to check for before creating the new
* collection, or to assign to the new collection
* @flags: not currently used
* @cancellable: optional cancellation object
@ -2199,7 +2199,7 @@ secret_service_create_item_dbus_path_sync (SecretService *self,
* secret_service_read_alias_dbus_path: (skip)
* @self: a secret service object
* @alias: the alias to lookup
* @cancellable: (allow-none): optional cancellation object
* @cancellable: (nullable): optional cancellation object
* @callback: called when the operation completes
* @user_data: data to pass to the callback
*
@ -2271,7 +2271,7 @@ secret_service_read_alias_dbus_path_finish (SecretService *self,
* secret_service_read_alias_dbus_path_sync: (skip)
* @self: a secret service object
* @alias: the alias to lookup
* @cancellable: (allow-none): optional cancellation object
* @cancellable: (nullable): optional cancellation object
* @error: location to place error on failure
*
* Lookup which collection is assigned to this alias. Aliases help determine
@ -2318,8 +2318,8 @@ secret_service_read_alias_dbus_path_sync (SecretService *self,
* secret_service_set_alias_to_dbus_path: (skip)
* @self: a secret service object
* @alias: the alias to assign the collection to
* @collection_path: (allow-none): the dbus object path of the collection to assign to the alias
* @cancellable: (allow-none): optional cancellation object
* @collection_path: (nullable): the dbus object path of the collection to assign to the alias
* @cancellable: (nullable): optional cancellation object
* @callback: called when the operation completes
* @user_data: data to pass to the callback
*
@ -2390,8 +2390,9 @@ secret_service_set_alias_to_dbus_path_finish (SecretService *self,
* secret_service_set_alias_to_dbus_path_sync: (skip)
* @self: a secret service object
* @alias: the alias to assign the collection to
* @collection_path: (allow-none): the dbus object path of the collection to assign to the alias
* @cancellable: (allow-none): optional cancellation object
* @collection_path: (nullable): the D-Bus object path of the collection to
* assign to the alias
* @cancellable: (nullable): optional cancellation object
* @error: location to place error on failure
*
* Assign a collection to this alias. Aliases help determine
@ -2445,7 +2446,7 @@ secret_service_set_alias_to_dbus_path_sync (SecretService *self,
* @self: the secret service
* @prompt_path: the D-Bus object path of the prompt
* @cancellable: optional cancellation object
* @return_type: (allow-none): the variant type of the prompt result
* @return_type: (nullable): the variant type of the prompt result
* @error: location to place error on failure
*
* Perform prompting for a #SecretPrompt.
@ -2491,7 +2492,7 @@ secret_service_prompt_at_dbus_path_sync (SecretService *self,
* secret_service_prompt_at_dbus_path: (skip)
* @self: the secret service
* @prompt_path: the D-Bus object path of the prompt
* @return_type: (allow-none): the variant type of the prompt result
* @return_type: (nullable): the variant type of the prompt result
* @cancellable: optional cancellation object
* @callback: called when the operation completes
* @user_data: data to be passed to the callback

6
libsecret/secret-prompt.c
View File

@ -120,7 +120,7 @@ _secret_prompt_instance (SecretService *service,
/**
* secret_prompt_run:
* @self: a prompt
* @window_id: (allow-none): string form of XWindow id for parent window to be transient for
* @window_id: (nullable): string form of XWindow id for parent window to be transient for
* @cancellable: optional cancellation object
* @return_type: the variant type of the prompt result
* @error: location to place an error on failure
@ -180,7 +180,7 @@ secret_prompt_run (SecretPrompt *self,
/**
* secret_prompt_perform_sync:
* @self: a prompt
* @window_id: (allow-none): string form of XWindow id for parent window to be transient for
* @window_id: (nullable): string form of XWindow id for parent window to be transient for
* @cancellable: optional cancellation object
* @return_type: the variant type of the prompt result
* @error: location to place an error on failure
@ -408,7 +408,7 @@ on_prompt_cancelled (GCancellable *cancellable,
/**
* secret_prompt_perform:
* @self: a prompt
* @window_id: (allow-none): string form of XWindow id for parent window to be transient for
* @window_id: (nullable): string form of XWindow id for parent window to be transient for
* @return_type: the variant type of the prompt result
* @cancellable: optional cancellation object
* @callback: called when the operation completes

12
libsecret/secret-service.c
View File

@ -1109,7 +1109,7 @@ secret_service_disconnect (void)
/**
* secret_service_open:
* @service_gtype: the GType of the new secret service
* @service_bus_name: (allow-none): the D-Bus service name of the secret service
* @service_bus_name: (nullable): the D-Bus service name of the secret service
* @flags: flags for which service functionality to ensure is initialized
* @cancellable: optional cancellation object
* @callback: called when the operation completes
@ -1184,7 +1184,7 @@ secret_service_open_finish (GAsyncResult *result,
/**
* secret_service_open_sync:
* @service_gtype: the GType of the new secret service
* @service_bus_name: (allow-none): the D-Bus service name of the secret service
* @service_bus_name: (nullable): the D-Bus service name of the secret service
* @flags: flags for which service functionality to ensure is initialized
* @cancellable: optional cancellation object
* @error: location to place an error on failure
@ -1267,7 +1267,7 @@ secret_service_get_flags (SecretService *self)
* initializing #SecretService proxy object, then this method will return
* %NULL. Use secret_service_load_collections() to load the collections.
*
* Returns: (transfer full) (element-type Secret.Collection) (allow-none): a
* Returns: (transfer full) (element-type Secret.Collection) (nullable): a
* list of the collections in the secret service
*/
GList *
@ -1372,7 +1372,7 @@ _secret_service_take_session (SecretService *self,
* This will be %NULL if no session has been established. Use
* secret_service_ensure_session() to establish a session.
*
* Returns: (allow-none): a string representing the algorithms for transferring
* Returns: (nullable): a string representing the algorithms for transferring
* secrets
*/
const gchar *
@ -1402,7 +1402,7 @@ secret_service_get_session_algorithms (SecretService *self)
* This will be %NULL if no session has been established. Use
* secret_service_ensure_session() to establish a session.
*
* Returns: (allow-none): a string representing the D-Bus object path of the
* Returns: (nullable): a string representing the D-Bus object path of the
* session
*/
const gchar *
@ -1848,7 +1848,7 @@ secret_service_prompt_sync (SecretService *self,
* secret_service_prompt:
* @self: the secret service
* @prompt: the prompt
* @return_type: (allow-none): the variant type of the prompt result
* @return_type: (nullable): the variant type of the prompt result
* @cancellable: optional cancellation object
* @callback: called when the operation completes
* @user_data: data to be passed to the callback

2
libsecret/secret-value.c
View File

@ -175,7 +175,7 @@ secret_value_get (SecretValue *value,
* Get the secret data in the #SecretValue if it contains a textual
* value. The content type must be <literal>text/plain</literal>.
*
* Returns: (allow-none): the content type
* Returns: (nullable): the content type
*/
const gchar *
secret_value_get_text (SecretValue *value)