[evolution/wip/webkit2] Bug 729241 - 'Mark all messages read' stuck after get_folder_info() failure

[Tomas Popela <tpopela src gnome org>]

commit e39858fe6680c88380356d6f402ae7bb57bc51f7
Author: Milan Crha <mcrha redhat com>
Date:   Tue Mar 10 12:43:47 2015 +0100

    Bug 729241 - 'Mark all messages read' stuck after get_folder_info() failure

 modules/mail/e-mail-shell-view-actions.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index f4829f2..5852101 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -632,7 +632,13 @@ mark_all_read_got_folder_info (GObject *source,
                return;
        }
 
-       g_return_if_fail (folder_info != NULL);
+       if (!folder_info) {
+               /* Otherwise the operation is stuck and the Evolution cannot be quit */
+               g_warn_if_fail (folder_info != NULL);
+               e_activity_set_state (context->activity, E_ACTIVITY_COMPLETED);
+               async_context_free (context);
+               return;
+       }
 
        response = mark_all_read_prompt_user (
                context->mail_shell_view,