aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-component.c
diff options
context:
space:
mode:
authorSuman Manjunath <msuman@src.gnome.org>2008-09-08 11:25:41 +0800
committerSuman Manjunath <msuman@src.gnome.org>2008-09-08 11:25:41 +0800
commit623b6f47b058ce6ba374162c397d138a6f831a3d (patch)
tree0d15353bc502085b25a99a713b73d32da7310332 /mail/mail-component.c
parent18451a4d0e67fc45a9648ed629f2e4324281baa2 (diff)
downloadgsoc2013-evolution-623b6f47b058ce6ba374162c397d138a6f831a3d.tar.gz
gsoc2013-evolution-623b6f47b058ce6ba374162c397d138a6f831a3d.tar.zst
gsoc2013-evolution-623b6f47b058ce6ba374162c397d138a6f831a3d.zip
Milan Crha <mcrha@redhat.com> Fix for bug #328216 (Bad signature prompt for self-signed pop3 servers).
svn path=/trunk/; revision=36273
Diffstat (limited to 'mail/mail-component.c')
-rw-r--r--mail/mail-component.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/mail/mail-component.c b/mail/mail-component.c
index 2704442bc7..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) {
@@ -505,8 +503,6 @@ impl_finalize (GObject *object)
g_object_unref (priv->logger);
g_free (priv);
- mail_session_shutdown ();
-
(* G_OBJECT_CLASS (parent_class)->finalize) (object);
}
@@ -902,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;
@@ -1301,7 +1301,7 @@ mail_component_init (MailComponent *component)
(GDestroyNotify) NULL,
(GDestroyNotify) store_hash_free);
- mail_autoreceive_init();
+ mail_autoreceive_init (session);
priv->mail_sync_in_progress = 0;
if (g_getenv("CAMEL_FLUSH_CHANGES"))