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

Merge branch 'fix-hang' into 'master'

Browse Source 
service: Fix secret_service_ensure_session_finish error propagation

See merge request GNOME/libsecret!36
This commit is contained in:
Daiki Ueno 2019-09-05 17:57:28 +00:00
commit 75db38cdcd
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libsecret/secret-service.c
View File

@ -1321,12 +1321,11 @@ secret_service_ensure_session_finish (SecretService *self,
{ {
g_return_val_if_fail (SECRET_IS_SERVICE (self), FALSE); g_return_val_if_fail (SECRET_IS_SERVICE (self), FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
g_return_val_if_fail (g_task_is_valid (result, self), FALSE);
if (!g_task_is_valid (result, self)) { if (!g_task_propagate_boolean (G_TASK (result), error)) {
if (!g_task_propagate_boolean (G_TASK (result), error)) { _secret_util_strip_remote_error (error);
_secret_util_strip_remote_error (error); return FALSE;
return FALSE;
}
} }
g_return_val_if_fail (self->pv->session != NULL, FALSE); g_return_val_if_fail (self->pv->session != NULL, FALSE);