diff options
| author | Ondrej Holy <oholy@redhat.com> | 2016-10-10 11:41:27 +0200 |
|---|---|---|
| committer | Ondrej Holy <oholy@redhat.com> | 2016-11-01 08:56:26 +0100 |
| commit | 6df182c89ab05bd06f8b351f4096f699366e283f (patch) | |
| tree | 00d170d0b4b4844456f60e5d58b958e3528bfe28 /common | |
| parent | c6b5d60946739cf206c9d171def4913b409f0325 (diff) | |
| download | gvfs-6df182c89ab05bd06f8b351f4096f699366e283f.tar.gz | |
gmountsource: Return "aborted" flag consistently
"aborted" flag is not returned consistently from the following functions
if the async reply containes an error: g_mount_source_show_processes,
g_mount_source_ask_question, and g_mount_source_ask_password. Set "aborted"
always on TRUE if an error occurs.
This change should not affect current functionality, because the usual
workflow is the following:
if (!g_mount_source_ask_password (..., &aborted, ...) || aborted) ...
https://bugzilla.gnome.org/show_bug.cgi?id=747412
Diffstat (limited to 'common')
| -rw-r--r-- | common/gmountsource.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/gmountsource.c b/common/gmountsource.c index 4686da35..702864e4 100644 --- a/common/gmountsource.c +++ b/common/gmountsource.c @@ -635,7 +635,7 @@ g_mount_source_ask_question_finish (GMountSource *source, gboolean *aborted, gint *choice_out) { - AskQuestionData *data, def= { FALSE, }; + AskQuestionData *data, def = { TRUE, }; g_return_val_if_fail (g_task_is_valid (result, source), FALSE); g_return_val_if_fail (g_async_result_is_tagged (result, g_mount_source_ask_question_async), FALSE); @@ -801,7 +801,7 @@ g_mount_source_show_processes_finish (GMountSource *source, gboolean *aborted, gint *choice_out) { - ShowProcessesData *data, def= { FALSE, }; + ShowProcessesData *data, def = { TRUE, }; g_return_val_if_fail (g_task_is_valid (result, source), FALSE); g_return_val_if_fail (g_async_result_is_tagged (result, g_mount_source_show_processes_async), FALSE); |