aboutsummaryrefslogtreecommitdiffstats
path: root/mail/e-mail-backend.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-06-13 02:28:07 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-06-13 02:28:07 +0800
commit51d0fc6863be998af5056605281cc0ebc2abfe00 (patch)
treeca9410d6729e2b3d989f0fbbc069c2563a634739 /mail/e-mail-backend.c
parent077116eac4cbfd5f06c44c8f5634469eab3130e6 (diff)
downloadgsoc2013-evolution-51d0fc6863be998af5056605281cc0ebc2abfe00.tar.gz
gsoc2013-evolution-51d0fc6863be998af5056605281cc0ebc2abfe00.tar.zst
gsoc2013-evolution-51d0fc6863be998af5056605281cc0ebc2abfe00.zip
Bug 603468 - Improve handling of --quit option
Diffstat (limited to 'mail/e-mail-backend.c')
-rw-r--r--mail/e-mail-backend.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index 7f62c466ad..a0453a963d 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -260,6 +260,7 @@ mail_backend_prepare_for_quit_cb (EShell *shell,
static void
mail_backend_quit_requested_cb (EShell *shell,
+ EShellQuitReason reason,
EShellBackend *shell_backend)
{
CamelFolder *folder;
@@ -272,6 +273,10 @@ mail_backend_quit_requested_cb (EShell *shell,
if (!e_shell_get_online (shell))
return;
+ /* Or if another Evolution process asked us to. */
+ if (reason == E_SHELL_QUIT_REMOTE_REQUEST)
+ return;
+
/* In express mode, don't raise mail request in non mail window. */
if (e_shell_get_express_mode(shell) &&
strcmp(e_shell_window_get_active_view((EShellWindow *)window), "mail") != 0)