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

Remove double check on collection_path in secret-collection.c

Browse Source 
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:
Garima Gaur 2016-12-07 16:28:01 +05:30 committed by Stef Walter
parent 780ae410ce
commit b9fbfbdb00
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libsecret/secret-collection.c
View File

@ -2220,31 +2220,26 @@ secret_collection_for_alias_sync (SecretService *service,
collection_path = secret_service_read_alias_dbus_path_sync (service, alias, collection_path = secret_service_read_alias_dbus_path_sync (service, alias,
cancellable, error); cancellable, error);
/* No collection for this alias */
if (collection_path == NULL) if (collection_path == NULL)
return NULL; return NULL;
/* No collection for this alias */ collection = _secret_service_find_collection_instance (service,
if (collection_path == NULL) { collection_path);
collection = NULL;
} else { if (collection != NULL) {
collection = _secret_service_find_collection_instance (service,
collection_path);
if (collection != NULL) { /* Have a collection with all necessary flags */
if (!collection_ensure_for_flags_sync (collection, flags,
/* Have a collection with all necessary flags */ cancellable, error)) {
if (!collection_ensure_for_flags_sync (collection, flags, g_object_unref (collection);
cancellable, error)) { collection = NULL;
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);
} }
/* 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); g_free (collection_path);