Merge branch 'wip/dueno/vapi-fixes' into 'master'

secret-paths: Add (nullable) if allowed.

See merge request GNOME/libsecret!15
This commit is contained in:
Niels De Graef 2019-03-01 09:57:54 +00:00
commit c8cbc2564f
2 changed files with 12 additions and 12 deletions

View File

@ -58,11 +58,11 @@ Service
.create_item_dbus_path_finish skip=false
.create_item_dbus_path_sync skip=false
.read_alias_dbus_path skip=false
.read_alias_dbus_path_finish skip=false
.read_alias_dbus_path_sync skip=false
.read_alias_dbus_path_finish skip=false nullable=true
.read_alias_dbus_path_sync skip=false nullable=true
.set_alias_to_dbus_path skip=false
.set_alias_to_dbus_path_finish skip=false
.set_alias_to_dbus_path_sync skip=false
.prompt_at_dbus_path_sync skip=false
.prompt_at_dbus_path_sync skip=false nullable=true
.prompt_at_dbus_path skip=false
.prompt_at_dbus_path_finish skip=false
.prompt_at_dbus_path_finish skip=false nullable=true

View File

@ -2268,8 +2268,8 @@ secret_service_read_alias_dbus_path (SecretService *self,
*
* Stability: Unstable
*
* Returns: (transfer full): the collection dbus object path, or %NULL if
* none assigned to the alias
* Returns: (transfer full) (nullable): the collection dbus object path,
* or %NULL if none assigned to the alias
*/
gchar *
secret_service_read_alias_dbus_path_finish (SecretService *self,
@ -2311,8 +2311,8 @@ secret_service_read_alias_dbus_path_finish (SecretService *self,
*
* Stability: Unstable
*
* Returns: (transfer full): the collection dbus object path, or %NULL if
* none assigned to the alias
* Returns: (transfer full) (nullable): the collection dbus object path,
* or %NULL if none assigned to the alias
*/
gchar *
secret_service_read_alias_dbus_path_sync (SecretService *self,
@ -2491,8 +2491,8 @@ secret_service_set_alias_to_dbus_path_sync (SecretService *self,
*
* Stability: Unstable
*
* Returns: (transfer full): %NULL if the prompt was dismissed or an error occurred,
* a variant result if the prompt was successful
* Returns: (transfer full) (nullable): %NULL if the prompt was dismissed or an
* error occurred, a variant result if the prompt was successful
*/
GVariant *
secret_service_prompt_at_dbus_path_sync (SecretService *self,
@ -2569,8 +2569,8 @@ secret_service_prompt_at_dbus_path (SecretService *self,
*
* Stability: Unstable
*
* Returns: (transfer full): %NULL if the prompt was dismissed or an error occurred,
* a variant result if the prompt was successful
* Returns: (transfer full) (nullable): %NULL if the prompt was dismissed or an
* error occurred, a variant result if the prompt was successful
*/
GVariant *
secret_service_prompt_at_dbus_path_finish (SecretService *self,