aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog10
-rw-r--r--mail/mail-component.c2
-rw-r--r--mail/mail-session.c6
-rw-r--r--mail/mail-session.h1
4 files changed, 19 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 64a817c749..17a089de5b 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,13 @@
+2008-08-20 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #546926
+
+ * mail-session.c (mail_session_shutdown):
+ New function simply calls camel_shutdown().
+
+ * mail-component.c (impl_finalize):
+ Call mail_session_shutdown().
+
2008-08-18 Matthew Barnes <mbarnes@redhat.com>
** Fixes part of bug #508732
diff --git a/mail/mail-component.c b/mail/mail-component.c
index 86a3388b1f..160e729da6 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -505,6 +505,8 @@ impl_finalize (GObject *object)
g_object_unref (priv->logger);
g_free (priv);
+ mail_session_shutdown ();
+
(* G_OBJECT_CLASS (parent_class)->finalize) (object);
}
diff --git a/mail/mail-session.c b/mail/mail-session.c
index 00e4c64405..b17dd968fb 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -711,6 +711,12 @@ mail_session_init (const char *base_directory)
g_free (camel_dir);
}
+void
+mail_session_shutdown (void)
+{
+ camel_shutdown ();
+}
+
gboolean
mail_session_get_interactive (void)
{
diff --git a/mail/mail-session.h b/mail/mail-session.h
index 600b43c7a9..d4c19a5ac4 100644
--- a/mail/mail-session.h
+++ b/mail/mail-session.h
@@ -33,6 +33,7 @@ extern "C" {
#endif /* __cplusplus */
void mail_session_init (const char *base_directory);
+void mail_session_shutdown (void);
gboolean mail_session_get_interactive (void);
void mail_session_set_interactive (gboolean interactive);
char *mail_session_request_dialog (const char *prompt, gboolean secret,