aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/mail-component.c3
2 files changed, 10 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index f3b39f6182..3411d8356b 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,12 @@
2008-02-18 Srinivasa Ragavan <sragavan@novell.com>
+ ** Fix for bug #167638
+
+ * mail-component.c: (impl_quit): Upstreamed Fejj's OpenSUSE patch for
+ faster quitting.
+
+2008-02-18 Srinivasa Ragavan <sragavan@novell.com>
+
** Fix for bnc #153807
* em-composer-utils.c: (em_utils_post_to_folder): Patch from OpenSUSE.
diff --git a/mail/mail-component.c b/mail/mail-component.c
index f1aec270cf..eb9f9c8b59 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -831,11 +831,14 @@ impl_quit(PortableServer_Servant servant, CORBA_Environment *ev)
mail_config_prune_proxies ();
switch (mc->priv->quit_state) {
case MC_QUIT_START: {
+ extern int camel_application_is_exiting;
int now = time(NULL)/60/60/24, days;
gboolean empty_junk;
GConfClient *gconf = mail_config_get_gconf_client();
+ camel_application_is_exiting = TRUE;
+
mail_vfolder_shutdown();
mc->priv->quit_expunge = gconf_client_get_bool(gconf, "/apps/evolution/mail/trash/empty_on_exit", NULL)