diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-09-11 23:34:29 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-09-11 23:34:29 +0800 |
| commit | c0a255eb90769638d57ae4122932f75c46e4e531 (patch) | |
| tree | 5213694107a246763c25c0a089553dd7c8708b32 /mail/mail-component.c | |
| parent | 4c8aa5982c0132716f473873d0e1d7601df14607 (diff) | |
| download | gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.gz gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.zst gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.zip | |
Merge revisions 36016:36303 from trunk.
svn path=/branches/kill-bonobo/; revision=36307
Diffstat (limited to 'mail/mail-component.c')
| -rw-r--r-- | mail/mail-component.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/mail/mail-component.c b/mail/mail-component.c index 86a3388b1f..bbb4f7e971 100644 --- a/mail/mail-component.c +++ b/mail/mail-component.c @@ -490,8 +490,6 @@ impl_finalize (GObject *object) g_free (priv->base_directory); - mail_async_event_destroy (priv->async_event); - g_hash_table_destroy (priv->store_hash); if (mail_async_event_destroy (priv->async_event) == -1) { @@ -900,7 +898,11 @@ impl_quit(PortableServer_Servant servant, CORBA_Environment *ev) /* Falls through */ case MC_QUIT_THREADS: /* should we keep cancelling? */ - return !mail_msg_active((unsigned int)-1); + if (mail_msg_active((unsigned int)-1)) + return FALSE; + + mail_session_shutdown (); + return TRUE; } return TRUE; @@ -1299,10 +1301,13 @@ mail_component_init (MailComponent *component) (GDestroyNotify) NULL, (GDestroyNotify) store_hash_free); - mail_autoreceive_init(); + mail_autoreceive_init (session); priv->mail_sync_in_progress = 0; - priv->mail_sync_id = g_timeout_add_seconds (mail_config_get_sync_timeout (), call_mail_sync, component); + if (g_getenv("CAMEL_FLUSH_CHANGES")) + priv->mail_sync_id = g_timeout_add_seconds (mail_config_get_sync_timeout (), call_mail_sync, component); + else + priv->mail_sync_id = 0; } /* Public API. */ |