[evolution/gnome-3-18] Ask for a forced quit when a user tries to re-close the window

[Milan Crha <mcrha src gnome org>]

commit 051b5d75f0fc887a327f110acfe228013794ccdf
Author: Milan Crha <mcrha redhat com>
Date:   Wed Nov 25 16:19:04 2015 +0100

    Ask for a forced quit when a user tries to re-close the window
    
    When the user calls Quit, the windows are disabled and the Evolution
    prepares for quit. In case the quit takes longer than a minute, the user
    is asked whether the Evolution should wait for the background tasks to
    finish or quit. Sometimes the user wants to quit even earlier, thus let
    it do it when it tries to close the window again.

 shell/e-shell.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/shell/e-shell.c b/shell/e-shell.c
index e4218bf..c367f76 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -2652,9 +2652,11 @@ e_shell_quit (EShell *shell,
                goto remote;
 
        /* Last Window reason can be used multiple times;
-          this is to not ask for a forced quit. */
-       if (reason == E_SHELL_QUIT_LAST_WINDOW && shell->priv->preparing_for_quit != NULL)
+          this is to ask for a forced quit before the timeout is reached. */
+       if (reason == E_SHELL_QUIT_LAST_WINDOW && shell->priv->preparing_for_quit != NULL) {
+               shell_prepare_for_quit (shell);
                return TRUE;
+       }
 
        if (!shell_request_quit (shell, reason))
                return FALSE;