aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2008-08-21 10:24:59 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-08-21 10:24:59 +0800
commitd288a5924b01682eb9ed491275564545fff68403 (patch)
treeac4686745e6247a6e8bcc1308a03ea38118ad441
parent8d596934137d2b596b0b96a4e18476ca216e4666 (diff)
downloadgsoc2013-evolution-d288a5924b01682eb9ed491275564545fff68403.tar
gsoc2013-evolution-d288a5924b01682eb9ed491275564545fff68403.tar.gz
gsoc2013-evolution-d288a5924b01682eb9ed491275564545fff68403.tar.bz2
gsoc2013-evolution-d288a5924b01682eb9ed491275564545fff68403.tar.lz
gsoc2013-evolution-d288a5924b01682eb9ed491275564545fff68403.tar.xz
gsoc2013-evolution-d288a5924b01682eb9ed491275564545fff68403.tar.zst
gsoc2013-evolution-d288a5924b01682eb9ed491275564545fff68403.zip
** Fixes bug #546926
2008-08-20 Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #546926 * configure.in: Bump eds_minimum_version to 2.23.91 for camel_shutdown(). * mail/mail-session.c (mail_session_shutdown): New function simply calls camel_shutdown(). * mail/mail-component.c (impl_finalize): Call mail_session_shutdown(). svn path=/trunk/; revision=36029
-rw-r--r--ChangeLog7
-rw-r--r--configure.in2
-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
6 files changed, 27 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cd9bfeba01..140bf31f7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-20 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #546926
+
+ * configure.in:
+ Bump eds_minimum_version to 2.23.91 for camel_shutdown().
+
2008-08-18 Srinivasa Ragavan <sragavan@novell.com>
* NEWS: Evolution 2.23.90 release and Version bump.
diff --git a/configure.in b/configure.in
index 09c24c490a..6ff18d10b2 100644
--- a/configure.in
+++ b/configure.in
@@ -13,7 +13,7 @@ GTKHTML_PACKAGE=3.14
# Required Packages
m4_define([glib_minimum_version], [2.16.0])
m4_define([gtk_minimum_version], [2.12.0])
-m4_define([eds_minimum_version], [2.23.90])
+m4_define([eds_minimum_version], [2.23.91])
m4_define([gnome_icon_theme_minimum_version], [2.19.91])
m4_define([libbonobo_minimum_version], [2.20.3])
m4_define([libbonoboui_minimum_version], [2.4.2])
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,