mirror of
https://gitlab.gnome.org/GNOME/libsecret.git
synced 2024-12-22 04:38:55 +00:00
Remove double check on collection_path in secret-collection.c
Signed-off-by: Stef Walter <stefw@redhat.com> * Most of the lines of change seem to be reindentation https://bugzilla.gnome.org/show_bug.cgi?id=775747
This commit is contained in:
parent
780ae410ce
commit
b9fbfbdb00
@ -2220,31 +2220,26 @@ secret_collection_for_alias_sync (SecretService *service,
|
||||
|
||||
collection_path = secret_service_read_alias_dbus_path_sync (service, alias,
|
||||
cancellable, error);
|
||||
/* No collection for this alias */
|
||||
if (collection_path == NULL)
|
||||
return NULL;
|
||||
|
||||
/* No collection for this alias */
|
||||
if (collection_path == NULL) {
|
||||
collection = NULL;
|
||||
collection = _secret_service_find_collection_instance (service,
|
||||
collection_path);
|
||||
|
||||
} else {
|
||||
collection = _secret_service_find_collection_instance (service,
|
||||
collection_path);
|
||||
if (collection != NULL) {
|
||||
|
||||
if (collection != NULL) {
|
||||
|
||||
/* Have a collection with all necessary flags */
|
||||
if (!collection_ensure_for_flags_sync (collection, flags,
|
||||
cancellable, error)) {
|
||||
g_object_unref (collection);
|
||||
collection = NULL;
|
||||
}
|
||||
|
||||
/* No collection loaded, but valid path, load */
|
||||
} else {
|
||||
collection = secret_collection_new_for_dbus_path_sync (service, collection_path,
|
||||
flags, cancellable, error);
|
||||
/* Have a collection with all necessary flags */
|
||||
if (!collection_ensure_for_flags_sync (collection, flags,
|
||||
cancellable, error)) {
|
||||
g_object_unref (collection);
|
||||
collection = NULL;
|
||||
}
|
||||
|
||||
/* No collection loaded, but valid path, load */
|
||||
} else {
|
||||
collection = secret_collection_new_for_dbus_path_sync (service, collection_path,
|
||||
flags, cancellable, error);
|
||||
}
|
||||
|
||||
g_free (collection_path);
|
||||
|
Loading…
Reference in New Issue
Block a user