aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@novell.com>2010-05-08 01:12:48 +0800
committerFederico Mena Quintero <federico@novell.com>2010-05-08 01:12:48 +0800
commit2aa44ca3df3a60357397a47316465ffbeda1e82c (patch)
tree9b5c20341f42d9b1bb53cfbf59207f3dd85704b9 /mail
parentac2ef9fb41e51292b379c6dee62dd765f783dae0 (diff)
parent4aa2552cb46f0daa67e135231f82f7d5403e2d19 (diff)
downloadgsoc2013-evolution-2aa44ca3df3a60357397a47316465ffbeda1e82c.tar.gz
gsoc2013-evolution-2aa44ca3df3a60357397a47316465ffbeda1e82c.tar.zst
gsoc2013-evolution-2aa44ca3df3a60357397a47316465ffbeda1e82c.zip
Merge express2 into relayout-composer
Diffstat (limited to 'mail')
-rw-r--r--mail/e-mail-backend.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index 4ab444027f..734fefbd72 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -22,6 +22,7 @@
*
*/
+#include <string.h>
#include "e-mail-backend.h"
#include <camel/camel.h>
@@ -283,6 +284,11 @@ mail_backend_quit_requested_cb (EShell *shell,
/* We can quit immediately if offline. */
if (!e_shell_get_online (shell))
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)
+ return;
/* Check Outbox for any unsent messages. */