[gvfs/wip/oholy/gtask: 31/44] gmountsource: Return "aborted" flag consistently



commit 81040638b93a39e66d63d5e4d526d8c0150f8ee5
Author: Ondrej Holy <oholy redhat com>
Date:   Mon Oct 10 11:41:27 2016 +0200

    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

 common/gmountsource.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/common/gmountsource.c b/common/gmountsource.c
index 4686da3..702864e 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);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]