[evolution-data-server] Remove dead Camel code that uses EPoolv.
- From: Matthew Barnes <mbarnes src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Remove dead Camel code that uses EPoolv.
- Date: Fri, 9 Oct 2009 17:24:29 +0000 (UTC)
commit de5d6c4a40b4548df2d585acf39fe1bc9f84903d
Author: Matthew Barnes <mbarnes redhat com>
Date: Fri Oct 9 11:45:54 2009 -0500
Remove dead Camel code that uses EPoolv.
camel/camel-folder-summary.c | 3 ---
camel/camel-vee-folder.c | 4 ----
camel/providers/local/camel-maildir-summary.c | 15 +--------------
3 files changed, 1 insertions(+), 21 deletions(-)
---
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index 264e37a..0bd1276 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -161,9 +161,6 @@ camel_folder_summary_init (CamelFolderSummary *s)
s->content_info_chunks = NULL;
p->need_preview = FALSE;
p->preview_updates = g_hash_table_new (g_str_hash, g_str_equal);
-#if defined (DOEPOOLV)
- s->message_info_strings = CAMEL_MESSAGE_INFO_LAST;
-#endif
s->version = CAMEL_FOLDER_SUMMARY_VERSION;
s->flags = 0;
diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c
index 5788c41..6ef8718 100644
--- a/camel/camel-vee-folder.c
+++ b/camel/camel-vee-folder.c
@@ -29,10 +29,6 @@
#include <glib.h>
#include <glib/gi18n-lib.h>
-#if defined (DOEPOOLV)
-#include <libedataserver/e-memory.h>
-#endif
-
#include "camel-db.h"
#include "camel-debug.h"
#include "camel-exception.h"
diff --git a/camel/providers/local/camel-maildir-summary.c b/camel/providers/local/camel-maildir-summary.c
index 5fa7ffc..e490634 100644
--- a/camel/providers/local/camel-maildir-summary.c
+++ b/camel/providers/local/camel-maildir-summary.c
@@ -132,10 +132,6 @@ camel_maildir_summary_init (CamelMaildirSummary *o)
s->message_info_size = sizeof(CamelMaildirMessageInfo);
s->content_info_size = sizeof(CamelMaildirMessageContentInfo);
-#if defined (DOEPOOLV)
- s->message_info_strings = CAMEL_MAILDIR_INFO_LAST;
-#endif
-
if (gethostname(hostname, 256) == 0) {
o->priv->hostname = g_strdup(hostname);
} else {
@@ -342,11 +338,10 @@ static CamelMessageInfo *message_info_new_from_header(CamelFolderSummary * s, st
static void
message_info_free(CamelFolderSummary *s, CamelMessageInfo *mi)
{
-#if !defined (DOEPOOLV)
CamelMaildirMessageInfo *mdi = (CamelMaildirMessageInfo *)mi;
g_free(mdi->filename);
-#endif
+
((CamelFolderSummaryClass *) parent_class)->message_info_free(s, mi);
}
@@ -626,12 +621,8 @@ maildir_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changes, Ca
filename = camel_maildir_info_filename(mdi);
/* TODO: only store the extension in the mdi->filename struct, not the whole lot */
if (filename == NULL || strcmp(filename, d->d_name) != 0) {
-#ifdef DOEPOOLV
- info->strings = e_poolv_set(info->strings, CAMEL_MAILDIR_INFO_FILENAME, d->d_name, FALSE);
-#else
g_free(mdi->filename);
mdi->filename = g_strdup(d->d_name);
-#endif
}
camel_message_info_free(info);
}
@@ -770,12 +761,8 @@ maildir_summary_sync(CamelLocalSummary *cls, gboolean expunge, CamelFolderChange
/* TODO: If this is made mt-safe, then this code could be a problem, since
the estrv is being modified.
Sigh, this may mean the maildir name has to be cached another way */
-#ifdef DOEPOOLV
- info->strings = e_poolv_set(info->strings, CAMEL_MAILDIR_INFO_FILENAME, newname, TRUE);
-#else
g_free(mdi->filename);
mdi->filename = newname;
-#endif
}
g_free(name);
g_free(dest);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]