aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2003-12-11 04:54:21 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2003-12-11 04:54:21 +0800
commitb3fb35cd87d3e699549478e4ba79958a46a762ab (patch)
tree44c3ffa977569dcba850abbfb45f558d969cf17e
parentbfdd0af479c7910de4ba940356b18b1f7b18c7bf (diff)
downloadgsoc2013-evolution-b3fb35cd87d3e699549478e4ba79958a46a762ab.tar.gz
gsoc2013-evolution-b3fb35cd87d3e699549478e4ba79958a46a762ab.tar.zst
gsoc2013-evolution-b3fb35cd87d3e699549478e4ba79958a46a762ab.zip
Fixed a leak.
2003-12-10 Jeffrey Stedfast <fejj@ximian.com> * em-migrate.c (get_local_store): Fixed a leak. * mail-component.c (impl_upgradeFromVersion): Implemented. svn path=/trunk/; revision=23914
-rw-r--r--mail/ChangeLog4
-rw-r--r--mail/em-migrate.c1
-rw-r--r--mail/mail-component.c26
3 files changed, 30 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index c64f413bf8..01232494d7 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,9 @@
2003-12-10 Jeffrey Stedfast <fejj@ximian.com>
+ * em-migrate.c (get_local_store): Fixed a leak.
+
+ * mail-component.c (impl_upgradeFromVersion): Implemented.
+
* em-folder-tree.c (em_folder_tree_set_selected): Add INFO_FAST
here as we don't need it to get unread counts.
(tree_row_expanded): Here too.
diff --git a/mail/em-migrate.c b/mail/em-migrate.c
index 99bc315db0..a43cc8b4fd 100644
--- a/mail/em-migrate.c
+++ b/mail/em-migrate.c
@@ -280,6 +280,7 @@ get_local_store (CamelSession *session, const char *dirname, const char *metadat
*namep = NULL;
xmlFree (name);
+ g_free (buf);
return store;
}
diff --git a/mail/mail-component.c b/mail/mail-component.c
index 744ec83ad3..442b17e9ac 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -400,7 +400,7 @@ impl_requestCreateItem (PortableServer_Servant servant,
}
static void
-impl_handleURI (PortableServer_Servant servant, const CORBA_char *uri, CORBA_Environment *ev)
+impl_handleURI (PortableServer_Servant servant, const char *uri, CORBA_Environment *ev)
{
if (!strncmp (uri, "mailto:", 7)) {
em_utils_compose_new_message_with_mailto (uri);
@@ -413,6 +413,29 @@ impl_sendAndReceive (PortableServer_Servant servant, CORBA_Environment *ev)
mail_send_receive ();
}
+static gboolean
+impl_upgradeFromVersion (PortableServer_Servant servant, short major, short minor, short revision, CORBA_Environment *ev)
+{
+ CamelException ex;
+
+ camel_exception_init (&ex);
+
+ switch (major) {
+ case 1:
+ switch (minor) {
+ case 0:
+ case 2:
+ case 4:
+ em_migrate (mail_component_peek (), &ex);
+ break;
+ }
+ break;
+ }
+
+ camel_exception_clear (&ex);
+
+ return TRUE;
+}
/* Initialization. */
@@ -432,6 +455,7 @@ mail_component_class_init (MailComponentClass *class)
epv->requestCreateItem = impl_requestCreateItem;
epv->handleURI = impl_handleURI;
epv->sendAndReceive = impl_sendAndReceive;
+ epv->upgradeFromVersion = impl_upgradeFromVersion;
}
static void