From 6658602b6b5e2e729a538f358bf0a87283246cbf Mon Sep 17 00:00:00 2001 From: Niels De Graef Date: Fri, 1 Mar 2019 09:59:34 +0100 Subject: [PATCH] secret-paths: Add (nullable) if allowed. This caused segfaults in Seahorse when someone canceled the "Change Password" dialog for a keyring. Related to GNOME/seahorse#204 --- libsecret/Secret-1.metadata | 8 ++++---- libsecret/secret-paths.c | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libsecret/Secret-1.metadata b/libsecret/Secret-1.metadata index 00448e8..bc9e364 100644 --- a/libsecret/Secret-1.metadata +++ b/libsecret/Secret-1.metadata @@ -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 \ No newline at end of file + .prompt_at_dbus_path_finish skip=false nullable=true diff --git a/libsecret/secret-paths.c b/libsecret/secret-paths.c index 92c89c3..2eafca2 100644 --- a/libsecret/secret-paths.c +++ b/libsecret/secret-paths.c @@ -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,