Commit 75db38cd authored by Daiki Ueno's avatar Daiki Ueno

Merge branch 'fix-hang' into 'master'

service: Fix secret_service_ensure_session_finish error propagation

See merge request !36
parents be541cf9 aae0329b
Pipeline #112005 passed with stages
in 7 minutes and 9 seconds
......@@ -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 (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)) {
_secret_util_strip_remote_error (error);
return FALSE;
}
if (!g_task_propagate_boolean (G_TASK (result), error)) {
_secret_util_strip_remote_error (error);
return FALSE;
}
g_return_val_if_fail (self->pv->session != NULL, FALSE);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment