[evolution-mapi] Bug 764065 - [Camel] Port more classes to GObject
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-mapi] Bug 764065 - [Camel] Port more classes to GObject
- Date: Tue, 8 Nov 2016 14:55:10 +0000 (UTC)
commit 341a2f4ea61f6d655fccdc23632f1cff5633fd3e
Author: Milan Crha <mcrha redhat com>
Date: Tue Nov 8 15:54:51 2016 +0100
Bug 764065 - [Camel] Port more classes to GObject
src/camel/CMakeLists.txt | 2 +
src/camel/camel-mapi-folder-summary.c | 151 +-----------
src/camel/camel-mapi-folder-summary.h | 17 +--
src/camel/camel-mapi-folder.c | 401 +++++++++++++------------------
src/camel/camel-mapi-message-info.c | 306 +++++++++++++++++++++++
src/camel/camel-mapi-message-info.h | 76 ++++++
src/camel/camel-mapi-store.c | 5 +-
src/libexchangemapi/e-mapi-mail-utils.c | 41 ++--
8 files changed, 599 insertions(+), 400 deletions(-)
---
diff --git a/src/camel/CMakeLists.txt b/src/camel/CMakeLists.txt
index 5604dc9..d360d88 100644
--- a/src/camel/CMakeLists.txt
+++ b/src/camel/CMakeLists.txt
@@ -15,6 +15,8 @@ set(SOURCES
camel-mapi-folder.h
camel-mapi-folder-summary.c
camel-mapi-folder-summary.h
+ camel-mapi-message-info.c
+ camel-mapi-message-info.h
camel-mapi-sasl-krb.c
camel-mapi-sasl-krb.h
camel-mapi-store.c
diff --git a/src/camel/camel-mapi-folder-summary.c b/src/camel/camel-mapi-folder-summary.c
index 922ca0b..56c6ce2 100644
--- a/src/camel/camel-mapi-folder-summary.c
+++ b/src/camel/camel-mapi-folder-summary.c
@@ -36,65 +36,22 @@
#define CAMEL_MAPI_FOLDER_SUMMARY_VERSION (1)
/*Prototypes*/
-static CamelFIRecord* mapi_summary_header_to_db (CamelFolderSummary *, GError **error);
-static gboolean mapi_summary_header_from_db (CamelFolderSummary *, CamelFIRecord *fir);
-
-static CamelMessageInfo *mapi_message_info_from_db (CamelFolderSummary *s, CamelMIRecord *mir);
-static CamelMIRecord *mapi_message_info_to_db (CamelFolderSummary *s, CamelMessageInfo *info);
-
-static CamelMessageContentInfo * mapi_content_info_from_db (CamelFolderSummary *s, CamelMIRecord *mir);
-static gboolean mapi_content_info_to_db (CamelFolderSummary *s, CamelMessageContentInfo *info, CamelMIRecord
*mir);
+static CamelFIRecord *mapi_summary_header_save (CamelFolderSummary *, GError **error);
+static gboolean mapi_summary_header_load (CamelFolderSummary *, CamelFIRecord *fir);
/*End of Prototypes*/
G_DEFINE_TYPE (CamelMapiFolderSummary, camel_mapi_folder_summary, CAMEL_TYPE_FOLDER_SUMMARY)
static void
-mapi_summary_finalize (GObject *object)
-{
- /* Chain up to parent's finalize() method. */
- G_OBJECT_CLASS (camel_mapi_folder_summary_parent_class)->finalize (object);
-}
-
-static CamelMessageInfo *
-mapi_message_info_clone(CamelFolderSummary *s, const CamelMessageInfo *mi)
-{
- CamelMapiMessageInfo *to;
- const CamelMapiMessageInfo *from = (const CamelMapiMessageInfo *)mi;
- CamelFolderSummaryClass *folder_summary_class;
-
- folder_summary_class = CAMEL_FOLDER_SUMMARY_CLASS (
- camel_mapi_folder_summary_parent_class);
-
- to = (CamelMapiMessageInfo *)folder_summary_class->message_info_clone(s, mi);
- to->server_flags = from->server_flags;
- to->last_modified = from->last_modified;
-
- /* FIXME: parent clone should do this */
- to->info.content = camel_folder_summary_content_info_new(s);
-
- return (CamelMessageInfo *)to;
-}
-
-static void
camel_mapi_folder_summary_class_init (CamelMapiFolderSummaryClass *class)
{
- GObjectClass *object_class;
CamelFolderSummaryClass *folder_summary_class;
- object_class = G_OBJECT_CLASS (class);
- object_class->finalize = mapi_summary_finalize;
-
folder_summary_class = CAMEL_FOLDER_SUMMARY_CLASS (class);
- folder_summary_class->message_info_size = sizeof (CamelMapiMessageInfo);
- folder_summary_class->content_info_size = sizeof (CamelMapiMessageContentInfo);
- folder_summary_class->message_info_clone = mapi_message_info_clone;
- folder_summary_class->summary_header_to_db = mapi_summary_header_to_db;
- folder_summary_class->summary_header_from_db = mapi_summary_header_from_db;
- folder_summary_class->message_info_to_db = mapi_message_info_to_db;
- folder_summary_class->message_info_from_db = mapi_message_info_from_db;
- folder_summary_class->content_info_to_db = mapi_content_info_to_db;
- folder_summary_class->content_info_from_db = mapi_content_info_from_db;
+ folder_summary_class->message_info_type = CAMEL_TYPE_MAPI_MESSAGE_INFO;
+ folder_summary_class->summary_header_save = mapi_summary_header_save;
+ folder_summary_class->summary_header_load = mapi_summary_header_load;
}
static void
@@ -118,9 +75,7 @@ camel_mapi_folder_summary_new (CamelFolder *folder)
summary = g_object_new (CAMEL_TYPE_MAPI_FOLDER_SUMMARY, "folder", folder, NULL);
- camel_folder_summary_set_build_content (summary, FALSE);
-
- if (!camel_folder_summary_load_from_db (summary, &local_error)) {
+ if (!camel_folder_summary_load (summary, &local_error)) {
/* FIXME: Isn't this dangerous ? We clear the summary
if it cannot be loaded, for some random reason.
We need to pass the ex and find out why it is not loaded etc. ? */
@@ -134,7 +89,7 @@ camel_mapi_folder_summary_new (CamelFolder *folder)
}
static gboolean
-mapi_summary_header_from_db (CamelFolderSummary *summary, CamelFIRecord *fir)
+mapi_summary_header_load (CamelFolderSummary *summary, CamelFIRecord *fir)
{
CamelMapiFolderSummary *mapi_summary = CAMEL_MAPI_FOLDER_SUMMARY (summary);
CamelFolderSummaryClass *folder_summary_class;
@@ -143,27 +98,26 @@ mapi_summary_header_from_db (CamelFolderSummary *summary, CamelFIRecord *fir)
folder_summary_class = CAMEL_FOLDER_SUMMARY_CLASS (
camel_mapi_folder_summary_parent_class);
- if (!folder_summary_class->summary_header_from_db (summary, fir))
+ if (!folder_summary_class->summary_header_load (summary, fir))
return FALSE;
part = fir->bdata;
if (part)
- mapi_summary->version = bdata_extract_digit (&part);
+ mapi_summary->version = camel_util_bdata_get_number (&part, 0);
return TRUE;
}
static CamelFIRecord *
-mapi_summary_header_to_db (CamelFolderSummary *summary, GError **error)
+mapi_summary_header_save (CamelFolderSummary *summary, GError **error)
{
CamelFolderSummaryClass *folder_summary_class;
struct _CamelFIRecord *fir;
- folder_summary_class = CAMEL_FOLDER_SUMMARY_CLASS (
- camel_mapi_folder_summary_parent_class);
+ folder_summary_class = CAMEL_FOLDER_SUMMARY_CLASS (camel_mapi_folder_summary_parent_class);
- fir = folder_summary_class->summary_header_to_db (summary, error);
+ fir = folder_summary_class->summary_header_save (summary, error);
if (!fir)
return NULL;
@@ -173,85 +127,6 @@ mapi_summary_header_to_db (CamelFolderSummary *summary, GError **error)
return fir;
}
-static CamelMessageInfo*
-mapi_message_info_from_db (CamelFolderSummary *s, CamelMIRecord *mir)
-{
- CamelFolderSummaryClass *folder_summary_class;
- CamelMessageInfo *info;
-
- folder_summary_class = CAMEL_FOLDER_SUMMARY_CLASS (
- camel_mapi_folder_summary_parent_class);
-
- info = folder_summary_class->message_info_from_db (s, mir);
- if (info) {
- gchar *part = mir->bdata;
- if (part && *part) {
- CamelMapiMessageInfo *m_info;
-
- m_info = (CamelMapiMessageInfo *) info;
- m_info->server_flags = bdata_extract_digit (&part);
- m_info->last_modified = bdata_extract_digit (&part);
- }
- }
-
- return info;
-}
-
-static CamelMIRecord *
-mapi_message_info_to_db (CamelFolderSummary *s, CamelMessageInfo *info)
-{
- CamelFolderSummaryClass *folder_summary_class;
- CamelMapiMessageInfo *m_info = (CamelMapiMessageInfo *) info;
- struct _CamelMIRecord *mir;
-
- folder_summary_class = CAMEL_FOLDER_SUMMARY_CLASS (
- camel_mapi_folder_summary_parent_class);
-
- mir = folder_summary_class->message_info_to_db (s, info);
- if (mir)
- mir->bdata = g_strdup_printf ("%u %u", m_info->server_flags, (guint32) m_info->last_modified);
-
- return mir;
-}
-
-static CamelMessageContentInfo*
-mapi_content_info_from_db (CamelFolderSummary *s, CamelMIRecord *mir)
-{
- CamelFolderSummaryClass *folder_summary_class;
- gchar *part = mir->cinfo;
- guint32 type=0;
-
- folder_summary_class = CAMEL_FOLDER_SUMMARY_CLASS (
- camel_mapi_folder_summary_parent_class);
-
- if (part)
- type = bdata_extract_digit (&part);
-
- mir->cinfo = part;
-
- if (type)
- return folder_summary_class->content_info_from_db (s, mir);
- else
- return camel_folder_summary_content_info_new (s);
-}
-
-static gboolean
-mapi_content_info_to_db (CamelFolderSummary *s, CamelMessageContentInfo *info, CamelMIRecord *mir)
-{
- CamelFolderSummaryClass *folder_summary_class;
-
- folder_summary_class = CAMEL_FOLDER_SUMMARY_CLASS (
- camel_mapi_folder_summary_parent_class);
-
- if (info->type) {
- mir->cinfo = g_strdup ("1");
- return folder_summary_class->content_info_to_db (s, info, mir);
- } else {
- mir->cinfo = g_strdup ("0");
- return TRUE;
- }
-}
-
void
mapi_summary_clear (CamelFolderSummary *summary, gboolean uncache)
{
@@ -270,7 +145,7 @@ mapi_summary_clear (CamelFolderSummary *summary, gboolean uncache)
uid = camel_message_info_get_uid (info);
camel_folder_change_info_remove_uid (changes, uid);
camel_folder_summary_remove_uid (summary, uid);
- camel_message_info_unref (info);
+ g_clear_object (&info);
}
camel_folder_summary_free_array (known_uids);
diff --git a/src/camel/camel-mapi-folder-summary.h b/src/camel/camel-mapi-folder-summary.h
index c530e8f..ed53d9d 100644
--- a/src/camel/camel-mapi-folder-summary.h
+++ b/src/camel/camel-mapi-folder-summary.h
@@ -26,6 +26,8 @@
#include <camel/camel.h>
+#include "camel-mapi-message-info.h"
+
/* Standard GObject macros */
#define CAMEL_TYPE_MAPI_FOLDER_SUMMARY \
(camel_mapi_folder_summary_get_type ())
@@ -47,23 +49,8 @@
G_BEGIN_DECLS
-#define CAMEL_MAPI_MESSAGE_WITH_READ_RECEIPT (CAMEL_MESSAGE_FOLDER_FLAGGED << 1)
-
typedef struct _CamelMapiFolderSummary CamelMapiFolderSummary;
typedef struct _CamelMapiFolderSummaryClass CamelMapiFolderSummaryClass;
-typedef struct _CamelMapiMessageInfo CamelMapiMessageInfo;
-typedef struct _CamelMapiMessageContentInfo CamelMapiMessageContentInfo;
-
-struct _CamelMapiMessageInfo {
- CamelMessageInfoBase info;
-
- guint32 server_flags;
- time_t last_modified; /* PidTagLastModificationTime of this message */
-};
-
-struct _CamelMapiMessageContentInfo {
- CamelMessageContentInfo info;
-};
struct _CamelMapiFolderSummary {
CamelFolderSummary parent;
diff --git a/src/camel/camel-mapi-folder.c b/src/camel/camel-mapi-folder.c
index cc726b3..9292ea5 100644
--- a/src/camel/camel-mapi-folder.c
+++ b/src/camel/camel-mapi-folder.c
@@ -143,12 +143,13 @@ mapi_folder_search_by_uids (CamelFolder *folder,
}
static void
-mapi_set_message_id (CamelMapiMessageInfo *mapi_mi, const gchar *message_id)
+mapi_set_message_id (CamelMessageInfo *mi,
+ const gchar *message_id)
{
gchar *msgid;
guint8 *digest;
gsize length;
- CamelMessageInfoBase *mi = &mapi_mi->info;
+ CamelSummaryMessageID tmp_msgid;
msgid = camel_header_msgid_decode (message_id);
if (msgid) {
@@ -162,24 +163,28 @@ mapi_set_message_id (CamelMapiMessageInfo *mapi_mi, const gchar *message_id)
g_checksum_get_digest (checksum, digest, &length);
g_checksum_free (checksum);
- memcpy(mi->message_id.id.hash, digest, sizeof(mi->message_id.id.hash));
- g_free(msgid);
- }
+ memcpy (tmp_msgid.id.hash, digest, sizeof (tmp_msgid.id.hash));
+ g_free (msgid);
+ camel_message_info_set_message_id (mi, tmp_msgid.id.id);
+ }
}
static void
-mapi_set_message_references (CamelMapiMessageInfo *mapi_mi, const gchar *references, const gchar
*in_reply_to)
+mapi_set_message_references (CamelMessageInfo *mi,
+ const gchar *references,
+ const gchar *in_reply_to)
{
- GSList *refs, *irt, *scan;
+ GSList *refs, *irt, *link;
guint8 *digest;
- gint count;
gsize length;
- CamelMessageInfoBase *mi = &mapi_mi->info;
+ CamelSummaryMessageID tmp_msgid;
refs = camel_header_references_decode (references);
irt = camel_header_references_decode (in_reply_to);
if (refs || irt) {
+ GArray *references;
+
if (irt) {
/* The References field is populated from the "References" and/or "In-Reply-To"
headers. If both headers exist, take the first thing in the In-Reply-To header
@@ -188,28 +193,27 @@ mapi_set_message_references (CamelMapiMessageInfo *mapi_mi, const gchar *referen
refs = g_slist_concat (irt, refs);
}
- count = g_slist_length (refs);
- mi->references = g_malloc(sizeof(*mi->references) + ((count-1) *
sizeof(mi->references->references[0])));
+ references = g_array_sized_new (FALSE, FALSE, sizeof (guint64), g_slist_length (refs));
length = g_checksum_type_get_length (G_CHECKSUM_MD5);
digest = g_alloca (length);
- count = 0;
- scan = refs;
- while (scan) {
+ for (link = refs; link; link = g_slist_next (link)) {
GChecksum *checksum;
checksum = g_checksum_new (G_CHECKSUM_MD5);
- g_checksum_update (checksum, (guchar *) scan->data, -1);
+ g_checksum_update (checksum, (guchar *) link->data, -1);
g_checksum_get_digest (checksum, digest, &length);
g_checksum_free (checksum);
- memcpy(mi->references->references[count].id.hash, digest,
sizeof(mi->message_id.id.hash));
- count++;
- scan = g_slist_next (scan);
+ memcpy (tmp_msgid.id.hash, digest, sizeof (tmp_msgid.id.hash));
+
+ g_array_append_val (references, tmp_msgid.id.id);
}
- mi->references->size = count;
+
g_slist_free_full (refs, g_free);
+
+ camel_message_info_take_references (mi, references);
}
}
@@ -233,7 +237,7 @@ add_message_to_cache (CamelMapiFolder *mapi_folder, const gchar *uid, CamelMimeM
folder = CAMEL_FOLDER (mapi_folder);
g_return_if_fail (folder != NULL);
- camel_folder_summary_lock (folder->summary);
+ camel_folder_summary_lock (camel_folder_get_folder_summary (folder));
base_stream = camel_data_cache_add (mapi_folder->cache, "cache", uid, NULL);
if (base_stream != NULL) {
@@ -265,7 +269,7 @@ add_message_to_cache (CamelMapiFolder *mapi_folder, const gchar *uid, CamelMimeM
g_object_unref (cache_stream);
}
- camel_folder_summary_unlock (folder->summary);
+ camel_folder_summary_unlock (camel_folder_get_folder_summary (folder));
}
struct GatherChangedObjectsData
@@ -307,9 +311,9 @@ gather_changed_objects_to_slist (EMapiConnection *conn,
info = camel_folder_summary_get (gco->summary, uid_str);
if (info) {
- CamelMapiMessageInfo *minfo = (CamelMapiMessageInfo *) info;
+ CamelMapiMessageInfo *minfo = CAMEL_MAPI_MESSAGE_INFO (info);
- if (minfo->last_modified != object_data->last_modified
+ if (camel_mapi_message_info_get_last_modified (minfo) != object_data->last_modified
&& (object_data->msg_flags & MSGFLAG_UNMODIFIED) == 0) {
update = TRUE;
} else {
@@ -324,26 +328,20 @@ gather_changed_objects_to_slist (EMapiConnection *conn,
if ((object_data->msg_flags & MSGFLAG_HASATTACH) != 0)
flags |= CAMEL_MESSAGE_ATTACHMENTS;
- if ((minfo->info.flags & CAMEL_MAPI_MESSAGE_WITH_READ_RECEIPT) != 0) {
+ if ((camel_message_info_get_flags (info) &
CAMEL_MAPI_MESSAGE_WITH_READ_RECEIPT) != 0) {
if ((object_data->msg_flags & MSGFLAG_RN_PENDING) == 0 &&
!camel_message_info_get_user_flag (info, "receipt-handled")) {
camel_message_info_set_user_flag (info, "receipt-handled",
TRUE);
- minfo->info.dirty = TRUE;
-
- camel_folder_summary_touch (gco->summary);
}
}
- if ((minfo->info.flags & mask) != (flags & mask)) {
+ if ((camel_message_info_get_flags (info) & mask) != (flags & mask)) {
camel_message_info_set_flags (info, mask, flags);
- minfo->server_flags = camel_message_info_get_flags (info);
- minfo->info.dirty = TRUE;
-
- camel_folder_summary_touch (gco->summary);
+ camel_mapi_message_info_set_server_flags (minfo,
camel_message_info_get_flags (info));
}
}
- camel_message_info_unref (info);
+ g_clear_object (&info);
}
} else {
update = TRUE;
@@ -375,7 +373,6 @@ update_message_info (CamelMessageInfo *info,
gboolean is_public_folder,
gboolean user_has_read)
{
- CamelMapiMessageInfo *minfo = (CamelMapiMessageInfo *) info;
guint32 flags = 0, mask = CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_ATTACHMENTS | CAMEL_MESSAGE_ANSWERED |
CAMEL_MESSAGE_FORWARDED | CAMEL_MAPI_MESSAGE_WITH_READ_RECEIPT;
const uint32_t *pmsg_flags, *picon_index;
const struct FILETIME *last_modified;
@@ -392,11 +389,11 @@ update_message_info (CamelMessageInfo *info,
pread_receipt = e_mapi_util_find_array_propval (&object->properties, PidTagReadReceiptRequested);
msg_class = e_mapi_util_find_array_propval (&object->properties, PidTagMessageClass);
- if (!minfo->info.size) {
+ if (!camel_message_info_get_size (info)) {
const uint32_t *msg_size;
msg_size = e_mapi_util_find_array_propval (&object->properties, PidTagMessageSize);
- minfo->info.size = msg_size ? *msg_size : 0;
+ camel_message_info_set_size (info, msg_size ? *msg_size : 0);
}
if (msg_class && g_str_has_prefix (msg_class, "REPORT.IPM.Note.IPNRN"))
@@ -410,11 +407,8 @@ update_message_info (CamelMessageInfo *info,
msg_flags = (msg_flags & (~MSGFLAG_READ)) | (user_has_read ? MSGFLAG_READ : 0);
}
- if (last_modified) {
- minfo->last_modified = e_mapi_util_filetime_to_time_t (last_modified);
- } else {
- minfo->last_modified = 0;
- }
+ camel_mapi_message_info_set_last_modified (CAMEL_MAPI_MESSAGE_INFO (info),
+ last_modified ? e_mapi_util_filetime_to_time_t (last_modified) : 0);
if ((msg_flags & MSGFLAG_READ) != 0)
flags |= CAMEL_MESSAGE_SEEN;
@@ -435,34 +429,21 @@ update_message_info (CamelMessageInfo *info,
if ((camel_message_info_get_flags (info) & mask) != flags) {
if (is_new)
- minfo->info.flags = flags;
+ camel_message_info_set_flags (info, ~0, flags);
else
camel_message_info_set_flags (info, mask, flags);
- minfo->server_flags = camel_message_info_get_flags (info);
+ camel_mapi_message_info_set_server_flags (CAMEL_MAPI_MESSAGE_INFO (info),
camel_message_info_get_flags (info));
}
-
- minfo->info.dirty = TRUE;
- camel_folder_summary_touch (minfo->info.summary);
}
static gsize
camel_mapi_get_message_size (CamelMimeMessage *msg)
{
- CamelStream *null;
- CamelDataWrapper *dw;
- gsize sz;
-
if (!CAMEL_IS_DATA_WRAPPER (msg))
return 0;
- dw = CAMEL_DATA_WRAPPER (msg);
- null = camel_stream_null_new ();
/* do not 'decode', let's be interested in the raw message size */
- camel_data_wrapper_write_to_stream_sync (dw, null, NULL, NULL);
- sz = CAMEL_STREAM_NULL (null)->written;
- g_object_unref (null);
-
- return sz;
+ return camel_data_wrapper_calculate_size_sync (CAMEL_DATA_WRAPPER (msg), NULL, NULL);
}
struct GatherObjectSummaryData
@@ -482,7 +463,7 @@ remove_removed_uids_cb (gpointer uid_str, gpointer value, gpointer user_data)
g_return_if_fail (gos->changes != NULL);
camel_folder_change_info_remove_uid (gos->changes, uid_str);
- camel_folder_summary_remove_uid (gos->folder->summary, uid_str);
+ camel_folder_summary_remove_uid (camel_folder_get_folder_summary (gos->folder), uid_str);
camel_data_cache_remove (CAMEL_MAPI_FOLDER (gos->folder)->cache, "cache", uid_str, NULL);
}
@@ -505,6 +486,7 @@ gather_object_for_offline_cb (EMapiConnection *conn,
msg = e_mapi_mail_utils_object_to_message (conn, object);
if (msg) {
+ CamelFolderSummary *folder_summary;
gchar *uid_str;
const mapi_id_t *pmid;
CamelMessageInfo *info;
@@ -528,44 +510,45 @@ gather_object_for_offline_cb (EMapiConnection *conn,
if (!uid_str)
return FALSE;
- is_new = !camel_folder_summary_check_uid (gos->folder->summary, uid_str);
+ folder_summary = camel_folder_get_folder_summary (gos->folder);
+ is_new = !camel_folder_summary_check_uid (folder_summary, uid_str);
if (!is_new) {
/* keep local read/unread flag on messages from public folders */
if (gos->is_public_folder) {
- info = camel_folder_summary_get (gos->folder->summary, uid_str);
+ info = camel_folder_summary_get (folder_summary, uid_str);
if (info) {
user_has_read = (camel_message_info_get_flags (info) &
CAMEL_MESSAGE_SEEN) != 0;
- camel_message_info_unref (info);
+ g_clear_object (&info);
}
}
- camel_folder_summary_remove_uid (gos->folder->summary, uid_str);
+ camel_folder_summary_remove_uid (folder_summary, uid_str);
}
- info = camel_folder_summary_info_new_from_message (gos->folder->summary, msg, NULL);
+ info = camel_folder_summary_info_new_from_message (folder_summary, msg);
if (info) {
- CamelMapiMessageInfo *minfo = (CamelMapiMessageInfo *) info;
+ camel_message_info_set_abort_notifications (info, TRUE);
- minfo->info.uid = camel_pstring_strdup (uid_str);
+ camel_message_info_set_uid (info, uid_str);
update_message_info (info, object, is_new, gos->is_public_folder, user_has_read);
- if (!minfo->info.size)
- minfo->info.size = camel_mapi_get_message_size (msg);
+ if (!camel_message_info_get_size (info))
+ camel_message_info_set_size (info, camel_mapi_get_message_size (msg));
- camel_folder_summary_add (gos->folder->summary, info);
- camel_message_info_ref (info);
+ camel_message_info_set_abort_notifications (info, FALSE);
+ camel_folder_summary_add (folder_summary, info, FALSE);
if (is_new) {
- camel_folder_change_info_add_uid (gos->changes, camel_message_info_get_uid
(info));
- camel_folder_change_info_recent_uid (gos->changes, camel_message_info_get_uid
(info));
+ camel_folder_change_info_add_uid (gos->changes, uid_str);
+ camel_folder_change_info_recent_uid (gos->changes, uid_str);
} else {
- camel_folder_change_info_change_uid (gos->changes, camel_message_info_get_uid
(info));
+ camel_folder_change_info_change_uid (gos->changes, uid_str);
}
add_message_to_cache (CAMEL_MAPI_FOLDER (gos->folder), uid_str, &msg, cancellable);
- camel_message_info_unref (info);
+ g_clear_object (&info);
} else {
g_debug ("%s: Failed to create message info from message", G_STRFUNC);
}
@@ -622,10 +605,8 @@ gather_object_summary_cb (EMapiConnection *conn,
if (!uid_str)
return FALSE;
- info = camel_folder_summary_get (gos->folder->summary, uid_str);
+ info = camel_folder_summary_get (camel_folder_get_folder_summary (gos->folder), uid_str);
if (!info) {
- CamelMapiMessageInfo *minfo;
-
is_new = TRUE;
if (transport_headers && *transport_headers) {
@@ -640,15 +621,17 @@ gather_object_summary_cb (EMapiConnection *conn,
g_object_unref (stream);
if (camel_mime_part_construct_from_parser_sync (part, parser, NULL, NULL)) {
- info = camel_folder_summary_info_new_from_header (gos->folder->summary,
part->headers);
+ info = camel_folder_summary_info_new_from_headers (
+ camel_folder_get_folder_summary (gos->folder),
+ camel_medium_get_headers (CAMEL_MEDIUM (part)));
if (info) {
const uint32_t *msg_size;
- minfo = (CamelMapiMessageInfo *) info;
- minfo->info.uid = camel_pstring_strdup (uid_str);
+ camel_message_info_freeze_notifications (info);
+ camel_message_info_set_uid (info, uid_str);
msg_size = e_mapi_util_find_array_propval (&object->properties,
PidTagMessageSize);
- minfo->info.size = msg_size ? *msg_size : 0;
+ camel_message_info_set_size (info, msg_size ? *msg_size : 0);
}
}
@@ -673,19 +656,20 @@ gather_object_summary_cb (EMapiConnection *conn,
display_to = e_mapi_util_find_array_propval (&object->properties, PidTagDisplayTo);
display_cc = e_mapi_util_find_array_propval (&object->properties, PidTagDisplayCc);
- info = camel_message_info_new (gos->folder->summary);
- minfo = (CamelMapiMessageInfo *) info;
+ info = camel_message_info_new (camel_folder_get_folder_summary (gos->folder));
- minfo->info.uid = camel_pstring_strdup (uid_str);
- minfo->info.subject = camel_pstring_strdup (subject);
- minfo->info.date_sent = e_mapi_util_filetime_to_time_t (submit_time);
- minfo->info.date_received = e_mapi_util_filetime_to_time_t (delivery_time);
- minfo->info.size = msg_size ? *msg_size : 0;
+ camel_message_info_freeze_notifications (info);
+
+ camel_message_info_set_uid (info, uid_str);
+ camel_message_info_set_subject (info, subject);
+ camel_message_info_set_date_sent (info, e_mapi_util_filetime_to_time_t (submit_time));
+ camel_message_info_set_date_received (info, e_mapi_util_filetime_to_time_t
(delivery_time));
+ camel_message_info_set_size (info, msg_size ? *msg_size : 0);
/* Threading related properties */
- mapi_set_message_id (minfo, message_id);
+ mapi_set_message_id (info, message_id);
if (references || in_reply_to)
- mapi_set_message_references (minfo, references, in_reply_to);
+ mapi_set_message_references (info, references, in_reply_to);
/* Recipients */
to_addr = (CamelAddress *) camel_internet_address_new ();
@@ -696,18 +680,18 @@ gather_object_summary_cb (EMapiConnection *conn,
if (camel_address_length (to_addr) > 0) {
formatted_addr = camel_address_format (to_addr);
- minfo->info.to = camel_pstring_strdup (formatted_addr);
+ camel_message_info_set_to (info, formatted_addr);
g_free (formatted_addr);
} else {
- minfo->info.to = camel_pstring_strdup (display_to);
+ camel_message_info_set_to (info, display_to);
}
if (camel_address_length (cc_addr) > 0) {
formatted_addr = camel_address_format (cc_addr);
- minfo->info.cc = camel_pstring_strdup (formatted_addr);
+ camel_message_info_set_cc (info, formatted_addr);
g_free (formatted_addr);
} else {
- minfo->info.cc = camel_pstring_strdup (display_cc);
+ camel_message_info_set_cc (info, display_cc);
}
g_object_unref (to_addr);
@@ -726,7 +710,7 @@ gather_object_summary_cb (EMapiConnection *conn,
if (from_email && *from_email) {
formatted_addr = camel_internet_address_format_address (from_name,
from_email);
- minfo->info.from = camel_pstring_strdup (formatted_addr);
+ camel_message_info_set_from (info, formatted_addr);
g_free (formatted_addr);
}
@@ -735,28 +719,29 @@ gather_object_summary_cb (EMapiConnection *conn,
g_free (from_email);
}
- minfo = (CamelMapiMessageInfo *) info;
- if (minfo->info.date_sent == 0)
- minfo->info.date_sent = minfo->info.date_received;
- if (minfo->info.date_received == 0)
- minfo->info.date_received = minfo->info.date_sent;
+ if (!camel_message_info_get_date_sent (info))
+ camel_message_info_set_date_sent (info, camel_message_info_get_date_received (info));
+ if (!camel_message_info_get_date_received (info))
+ camel_message_info_set_date_received (info, camel_message_info_get_date_sent (info));
+ } else {
+ camel_message_info_freeze_notifications (info);
}
user_has_read = (camel_message_info_get_flags (info) & CAMEL_MESSAGE_SEEN) != 0;
update_message_info (info, object, is_new, gos->is_public_folder, user_has_read);
+ camel_message_info_thaw_notifications (info);
+
if (is_new) {
- camel_folder_summary_add (gos->folder->summary, info);
+ camel_folder_summary_add (camel_folder_get_folder_summary (gos->folder), info, FALSE);
camel_folder_change_info_add_uid (gos->changes, camel_message_info_get_uid (info));
camel_folder_change_info_recent_uid (gos->changes, camel_message_info_get_uid (info));
-
- camel_message_info_ref (info);
} else {
camel_folder_change_info_change_uid (gos->changes, camel_message_info_get_uid (info));
}
- camel_message_info_unref (info);
+ g_clear_object (&info);
if (obj_total > 0)
camel_operation_progress (cancellable, obj_index * 100 / obj_total);
@@ -816,7 +801,7 @@ camel_mapi_folder_fetch_summary (CamelFolder *folder, GCancellable *cancellable,
gco.latest_last_modify = 0;
gco.fid = mapi_object_get_id (&obj_folder);
- gco.summary = folder->summary;
+ gco.summary = camel_folder_get_folder_summary (folder);
gco.to_update = NULL;
gco.removed_uids = NULL;
gco.is_public_folder = (mapi_folder->mapi_folder_flags & CAMEL_MAPI_STORE_FOLDER_FLAG_PUBLIC) != 0;
@@ -824,10 +809,10 @@ camel_mapi_folder_fetch_summary (CamelFolder *folder, GCancellable *cancellable,
if (msi->latest_last_modify <= 0) {
GPtrArray *known_uids;
- camel_folder_summary_prepare_fetch_all (folder->summary, NULL);
+ camel_folder_summary_prepare_fetch_all (camel_folder_get_folder_summary (folder), NULL);
gco.removed_uids = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify)
camel_pstring_free, NULL);
- known_uids = camel_folder_summary_get_array (folder->summary);
+ known_uids = camel_folder_summary_get_array (camel_folder_get_folder_summary (folder));
if (known_uids) {
gint ii;
@@ -901,7 +886,7 @@ camel_mapi_folder_fetch_summary (CamelFolder *folder, GCancellable *cancellable,
if (mapi_error && *mapi_error)
camel_mapi_store_maybe_disconnect (mapi_store, *mapi_error);
- camel_folder_summary_save_to_db (folder->summary, NULL);
+ camel_folder_summary_save (camel_folder_get_folder_summary (folder), NULL);
camel_folder_thaw (folder);
return status;
@@ -983,7 +968,7 @@ mapi_refresh_folder (CamelFolder *folder, GCancellable *cancellable, GError **er
goto end1;
}
- camel_folder_summary_touch (folder->summary);
+ camel_folder_summary_touch (camel_folder_get_folder_summary (folder));
end1:
return success;
@@ -1004,44 +989,16 @@ mapi_folder_search_free (CamelFolder *folder, GPtrArray *uids)
}
-#if 0
-static CamelMessageInfo*
-mapi_get_message_info(CamelFolder *folder, const gchar *uid)
+static guint32
+mapi_folder_get_permanent_flags (CamelFolder *folder)
{
- CamelMessageInfo *msg_info = NULL;
- CamelMessageInfoBase *mi = (CamelMessageInfoBase *)msg;
- gint status = 0;
- oc_message_headers_t headers;
-
- if (folder->summary) {
- msg_info = camel_folder_summary_uid(folder->summary, uid);
- }
- if (msg_info != NULL) {
- mi = (CamelMessageInfoBase *)msg_info;
- return (msg_info);
- }
- /* Go online and fetch message summary. */
-
- msg_info = camel_message_info_new(folder->summary);
- mi = (CamelMessageInfoBase *)msg_info;
-
- if (headers.subject) mi->subject = (gchar *)camel_pstring_strdup(headers.subject);
- if (headers.from) mi->from = (gchar *)camel_pstring_strdup(headers.from);
- if (headers.to) mi->to = (gchar *)camel_pstring_strdup(headers.to);
- if (headers.cc) mi->cc = (gchar *)camel_pstring_strdup(headers.cc);
- mi->flags = headers.flags;
-
- mi->user_flags = NULL;
- mi->user_tags = NULL;
- mi->date_received = 0;
- mi->date_sent = headers.send;
- mi->content = NULL;
- mi->summary = folder->summary;
- if (uid) mi->uid = g_strdup(uid);
- oc_message_headers_release(&headers);
- return (msg);
+ return CAMEL_MESSAGE_ANSWERED |
+ CAMEL_MESSAGE_DELETED |
+ CAMEL_MESSAGE_DRAFT |
+ CAMEL_MESSAGE_FLAGGED |
+ CAMEL_MESSAGE_SEEN |
+ CAMEL_MESSAGE_JUNK;
}
-#endif
static void
mapi_folder_rename (CamelFolder *folder, const gchar *new)
@@ -1052,13 +1009,13 @@ mapi_folder_rename (CamelFolder *folder, const gchar *new)
camel_store_summary_disconnect_folder_summary (
((CamelMapiStore *) parent_store)->summary,
- folder->summary);
+ camel_folder_get_folder_summary (folder));
((CamelFolderClass *)camel_mapi_folder_parent_class)->rename(folder, new);
camel_store_summary_connect_folder_summary (
((CamelMapiStore *) parent_store)->summary,
- camel_folder_get_full_name (folder), folder->summary);
+ camel_folder_get_full_name (folder), camel_folder_get_folder_summary (folder));
}
static gint
@@ -1070,27 +1027,6 @@ mapi_cmp_uids (CamelFolder *folder, const gchar *uid1, const gchar *uid2)
return strcmp (uid1, uid2);
}
-static gboolean
-mapi_set_message_flags (CamelFolder *folder,
- const gchar *uid,
- CamelMessageFlags flags,
- CamelMessageFlags set)
-{
- CamelMessageInfo *info;
- gint res;
-
- g_return_val_if_fail (folder->summary != NULL, FALSE);
-
- info = camel_folder_summary_get (folder->summary, uid);
- if (info == NULL)
- return FALSE;
-
- res = camel_message_info_set_flags (info, flags, set);
-
- camel_message_info_unref (info);
- return res;
-}
-
static void
mapi_folder_dispose (GObject *object)
{
@@ -1098,7 +1034,7 @@ mapi_folder_dispose (GObject *object)
CamelFolder *folder = CAMEL_FOLDER (object);
CamelMapiFolder *mapi_folder = CAMEL_MAPI_FOLDER (object);
- camel_folder_summary_save_to_db (folder->summary, NULL);
+ camel_folder_summary_save (camel_folder_get_folder_summary (folder), NULL);
if (mapi_folder->cache != NULL) {
g_object_unref (mapi_folder->cache);
@@ -1114,7 +1050,7 @@ mapi_folder_dispose (GObject *object)
if (parent_store) {
camel_store_summary_disconnect_folder_summary (
(CamelStoreSummary *) ((CamelMapiStore *) parent_store)->summary,
- CAMEL_FOLDER (mapi_folder)->summary);
+ camel_folder_get_folder_summary (CAMEL_FOLDER (mapi_folder)));
}
/* Chain up to parent's dispose() method. */
@@ -1291,9 +1227,9 @@ mapi_folder_expunge_sync (CamelFolder *folder,
{
CamelMapiStore *mapi_store;
CamelMapiFolder *mapi_folder;
- CamelMapiMessageInfo *minfo;
CamelMessageInfo *info;
CamelFolderChangeInfo *changes;
+ CamelFolderSummary *folder_summary;
CamelStore *parent_store;
GPtrArray *known_uids;
gint i;
@@ -1306,6 +1242,7 @@ mapi_folder_expunge_sync (CamelFolder *folder,
deleted_items_uid = deleted_items_uid_head = NULL;
parent_store = camel_folder_get_parent_store (folder);
+ folder_summary = camel_folder_get_folder_summary (folder);
mapi_folder = CAMEL_MAPI_FOLDER (folder);
mapi_store = CAMEL_MAPI_STORE (parent_store);
@@ -1321,7 +1258,7 @@ mapi_folder_expunge_sync (CamelFolder *folder,
gint ii;
/* get deleted messages from all active folders too */
- folders = camel_object_bag_list (parent_store->folders);
+ folders = camel_store_dup_opened_folders (parent_store);
for (ii = 0; ii < folders->len; ii++) {
CamelFolder *opened_folder = CAMEL_FOLDER (folders->pdata[ii]);
CamelMapiFolder *mf;
@@ -1347,7 +1284,7 @@ mapi_folder_expunge_sync (CamelFolder *folder,
if (status) {
camel_folder_freeze (folder);
- mapi_summary_clear (folder->summary, TRUE);
+ mapi_summary_clear (folder_summary, TRUE);
camel_folder_thaw (folder);
} else if (mapi_error) {
if (!e_mapi_utils_propagate_cancelled_error (mapi_error, error))
@@ -1368,13 +1305,13 @@ mapi_folder_expunge_sync (CamelFolder *folder,
}
changes = camel_folder_change_info_new ();
- known_uids = camel_folder_summary_get_array (folder->summary);
+ folder_summary = camel_folder_get_folder_summary (folder);
+ known_uids = camel_folder_summary_get_array (folder_summary);
/*Collect UIDs of deleted messages.*/
for (i = 0; known_uids && i < known_uids->len; i++) {
- info = camel_folder_summary_get (folder->summary, g_ptr_array_index (known_uids, i));
- minfo = (CamelMapiMessageInfo *) info;
- if (minfo && (minfo->info.flags & CAMEL_MESSAGE_DELETED)) {
+ info = camel_folder_summary_get (folder_summary, g_ptr_array_index (known_uids, i));
+ if (info && (camel_message_info_get_flags (info) & CAMEL_MESSAGE_DELETED) != 0) {
const gchar *uid = camel_message_info_get_uid (info);
mapi_id_t *mid = g_new0 (mapi_id_t, 1);
@@ -1390,7 +1327,7 @@ mapi_folder_expunge_sync (CamelFolder *folder,
}
deleted_items_uid = g_slist_prepend (deleted_items_uid, (gpointer) uid);
}
- camel_message_info_unref (info);
+ g_clear_object (&info);
}
camel_folder_summary_free_array (known_uids);
@@ -1415,11 +1352,11 @@ mapi_folder_expunge_sync (CamelFolder *folder,
if (status) {
while (deleted_items_uid) {
const gchar *uid = (gchar *)deleted_items_uid->data;
- camel_folder_summary_lock (folder->summary);
+ camel_folder_summary_lock (folder_summary);
camel_folder_change_info_remove_uid (changes, uid);
- camel_folder_summary_remove_uid (folder->summary, uid);
+ camel_folder_summary_remove_uid (folder_summary, uid);
camel_data_cache_remove(mapi_folder->cache, "cache", uid, NULL);
- camel_folder_summary_unlock (folder->summary);
+ camel_folder_summary_unlock (folder_summary);
deleted_items_uid = g_slist_next (deleted_items_uid);
}
}
@@ -1451,7 +1388,7 @@ mapi_folder_get_message_cached (CamelFolder *folder,
mapi_folder = CAMEL_MAPI_FOLDER (folder);
- if (!camel_folder_summary_check_uid (folder->summary, message_uid))
+ if (!camel_folder_summary_check_uid (camel_folder_get_folder_summary (folder), message_uid))
return NULL;
stream = camel_stream_mem_new ();
@@ -1515,7 +1452,7 @@ mapi_folder_get_message_sync (CamelFolder *folder,
CamelMimeMessage *msg = NULL;
CamelMapiFolder *mapi_folder;
CamelMapiStore *mapi_store;
- CamelMapiMessageInfo *mi = NULL;
+ CamelMessageInfo *mi;
CamelStore *parent_store;
mapi_id_t id_message;
EMapiConnection *conn;
@@ -1530,7 +1467,7 @@ mapi_folder_get_message_sync (CamelFolder *folder,
/* see if it is there in cache */
- mi = (CamelMapiMessageInfo *) camel_folder_summary_get (folder->summary, uid);
+ mi = camel_folder_summary_get (camel_folder_get_folder_summary (folder), uid);
if (mi == NULL) {
/* Translators: The first %s is replaced with a message ID,
the second %s is replaced with a detailed error string */
@@ -1544,7 +1481,7 @@ mapi_folder_get_message_sync (CamelFolder *folder,
msg = mapi_folder_get_message_cached (folder, uid, cancellable);
if (msg != NULL) {
- camel_message_info_unref (&mi->info);
+ g_clear_object (&mi);
return msg;
}
@@ -1553,7 +1490,7 @@ mapi_folder_get_message_sync (CamelFolder *folder,
error, CAMEL_SERVICE_ERROR,
CAMEL_SERVICE_ERROR_UNAVAILABLE,
_("This message is not available in offline mode."));
- camel_message_info_unref (&mi->info);
+ g_clear_object (&mi);
return NULL;
}
@@ -1571,13 +1508,15 @@ mapi_folder_get_message_sync (CamelFolder *folder,
CAMEL_SERVICE_ERROR_INVALID,
_("Could not get message"));
}
- camel_message_info_unref (&mi->info);
+ g_clear_object (&mi);
return NULL;
}
conn = camel_mapi_store_ref_connection (mapi_store, cancellable, error);
- if (!conn)
+ if (!conn) {
+ g_clear_object (&mi);
return NULL;
+ }
e_mapi_util_mapi_id_from_string (uid, &id_message);
@@ -1604,13 +1543,13 @@ mapi_folder_get_message_sync (CamelFolder *folder,
CAMEL_SERVICE_ERROR_INVALID,
_("Could not get message"));
}
- camel_message_info_unref (&mi->info);
+ g_clear_object (&mi);
return NULL;
}
add_message_to_cache (mapi_folder, uid, &msg, cancellable);
- camel_message_info_unref (&mi->info);
+ g_clear_object (&mi);
return msg;
}
@@ -1632,9 +1571,9 @@ mapi_folder_synchronize_sync (CamelFolder *folder,
CamelMapiStore *mapi_store;
CamelMapiFolder *mapi_folder;
CamelMessageInfo *info = NULL;
- CamelMapiMessageInfo *mapi_info = NULL;
CamelStore *parent_store;
CamelFolderChangeInfo *changes = NULL;
+ CamelFolderSummary *folder_summary;
CamelServiceConnectionStatus status;
CamelService *service;
EMapiConnection *conn;
@@ -1651,6 +1590,7 @@ mapi_folder_synchronize_sync (CamelFolder *folder,
full_name = camel_folder_get_full_name (folder);
parent_store = camel_folder_get_parent_store (folder);
+ folder_summary = camel_folder_get_folder_summary (folder);
mapi_folder = CAMEL_MAPI_FOLDER (folder);
mapi_store = CAMEL_MAPI_STORE (parent_store);
@@ -1672,18 +1612,17 @@ mapi_folder_synchronize_sync (CamelFolder *folder,
is_junk_folder = (mapi_folder->camel_folder_flags & CAMEL_FOLDER_TYPE_MASK) == CAMEL_FOLDER_TYPE_JUNK;
- camel_folder_summary_lock (folder->summary);
- camel_folder_summary_prepare_fetch_all (folder->summary, NULL);
+ camel_folder_summary_lock (folder_summary);
+ camel_folder_summary_prepare_fetch_all (folder_summary, NULL);
- known_uids = camel_folder_summary_get_array (folder->summary);
+ known_uids = camel_folder_summary_get_array (folder_summary);
for (i = 0; known_uids && i < known_uids->len; i++) {
- info = camel_folder_summary_get (folder->summary, g_ptr_array_index (known_uids, i));
- mapi_info = (CamelMapiMessageInfo *) info;
+ info = camel_folder_summary_get (folder_summary, g_ptr_array_index (known_uids, i));
- if (mapi_info && (mapi_info->info.flags & CAMEL_MESSAGE_FOLDER_FLAGGED)) {
+ if (info && camel_message_info_get_folder_flagged (info)) {
const gchar *uid;
mapi_id_t *mid = g_new0 (mapi_id_t, 1); /* FIXME : */
- guint32 flags;
+ guint32 flags, server_flags;
gboolean used = FALSE;
uid = camel_message_info_get_uid (info);
@@ -1691,17 +1630,18 @@ mapi_folder_synchronize_sync (CamelFolder *folder,
/* Why are we getting so much noise here :-/ */
if (!e_mapi_util_mapi_id_from_string (uid, mid)) {
- camel_message_info_unref (info);
+ g_clear_object (&info);
g_free (mid);
continue;
}
- mapi_utils_do_flags_diff (&diff, mapi_info->server_flags, mapi_info->info.flags);
- mapi_utils_do_flags_diff (&unset_flags, flags, mapi_info->server_flags);
+ server_flags = camel_mapi_message_info_get_server_flags (CAMEL_MAPI_MESSAGE_INFO
(info));
+ mapi_utils_do_flags_diff (&diff, server_flags, flags);
+ mapi_utils_do_flags_diff (&unset_flags, flags, server_flags);
- diff.changed &= folder->permanent_flags;
+ diff.changed &= camel_folder_get_permanent_flags (folder);
if (!diff.changed) {
- camel_message_info_unref (info);
+ g_clear_object (&info);
g_free (mid);
continue;
}
@@ -1728,15 +1668,14 @@ mapi_folder_synchronize_sync (CamelFolder *folder,
else
g_free (mid);
- mapi_info->server_flags = mapi_info->info.flags;
+ camel_mapi_message_info_set_server_flags (CAMEL_MAPI_MESSAGE_INFO (info),
camel_message_info_get_flags (info));
}
- if (info)
- camel_message_info_unref (info);
+ g_clear_object (&info);
}
camel_folder_summary_free_array (known_uids);
- camel_folder_summary_unlock (folder->summary);
+ camel_folder_summary_unlock (folder_summary);
/*
Sync up the READ changes before deleting the message.
@@ -1799,10 +1738,10 @@ mapi_folder_synchronize_sync (CamelFolder *folder,
changes = camel_folder_change_info_new ();
camel_folder_change_info_remove_uid (changes, deleted_msg_uid);
- camel_folder_summary_lock (folder->summary);
- camel_folder_summary_remove_uid (folder->summary, deleted_msg_uid);
+ camel_folder_summary_lock (folder_summary);
+ camel_folder_summary_remove_uid (folder_summary, deleted_msg_uid);
camel_data_cache_remove(mapi_folder->cache, "cache", deleted_msg_uid, NULL);
- camel_folder_summary_unlock (folder->summary);
+ camel_folder_summary_unlock (folder_summary);
g_free (deleted_msg_uid);
}
@@ -1922,10 +1861,13 @@ mapi_folder_transfer_messages_to_sync (CamelFolder *source,
g_clear_error (&mapi_error);
success = FALSE;
} else if (delete_originals) {
+ CamelFolderSummary *source_summary;
+
+ source_summary = camel_folder_get_folder_summary (source);
changes = camel_folder_change_info_new ();
for (i = 0; i < uids->len; i++) {
- camel_folder_summary_remove_uid (source->summary, uids->pdata[i]);
+ camel_folder_summary_remove_uid (source_summary, uids->pdata[i]);
camel_folder_change_info_remove_uid (changes, uids->pdata[i]);
}
camel_folder_changed (source, changes);
@@ -2023,12 +1965,12 @@ camel_mapi_folder_class_init (CamelMapiFolderClass *class)
object_class->constructed = mapi_folder_constructed;
folder_class = CAMEL_FOLDER_CLASS (class);
+ folder_class->get_permanent_flags = mapi_folder_get_permanent_flags;
folder_class->rename = mapi_folder_rename;
folder_class->search_by_expression = mapi_folder_search_by_expression;
folder_class->cmp_uids = mapi_cmp_uids;
folder_class->search_by_uids = mapi_folder_search_by_uids;
folder_class->search_free = mapi_folder_search_free;
- folder_class->set_message_flags = mapi_set_message_flags;
folder_class->append_message_sync = mapi_folder_append_message_sync;
folder_class->expunge_sync = mapi_folder_expunge_sync;
folder_class->get_message_sync = mapi_folder_get_message_sync;
@@ -2046,10 +1988,7 @@ camel_mapi_folder_init (CamelMapiFolder *mapi_folder)
mapi_folder->priv = G_TYPE_INSTANCE_GET_PRIVATE (mapi_folder, CAMEL_TYPE_MAPI_FOLDER,
CamelMapiFolderPrivate);
- folder->permanent_flags = CAMEL_MESSAGE_ANSWERED | CAMEL_MESSAGE_DELETED |
- CAMEL_MESSAGE_DRAFT | CAMEL_MESSAGE_FLAGGED | CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_JUNK;
-
- folder->folder_flags = CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY;
+ camel_folder_set_flags (folder, CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY);
g_mutex_init (&mapi_folder->priv->search_lock);
@@ -2064,19 +2003,18 @@ camel_mapi_folder_new (CamelStore *store,
GError **error)
{
- CamelFolder *folder = NULL;
+ CamelFolder *folder;
+ CamelFolderSummary *folder_summary;
CamelMapiFolder *mapi_folder;
- CamelMapiStore *mapi_store = (CamelMapiStore *) store;
- CamelService *service;
- CamelSettings *settings;
-
+ CamelMapiStore *mapi_store = (CamelMapiStore *) store;
+ CamelService *service;
+ CamelSettings *settings;
gchar *state_file;
const gchar *short_name;
CamelStoreInfo *si;
gboolean filter_inbox;
service = CAMEL_SERVICE (store);
-
settings = camel_service_ref_settings (service);
filter_inbox = camel_store_settings_get_filter_inbox (CAMEL_STORE_SETTINGS (settings));
@@ -2096,12 +2034,12 @@ camel_mapi_folder_new (CamelStore *store,
"parent-store", store,
NULL);
- mapi_folder = CAMEL_MAPI_FOLDER(folder);
+ mapi_folder = CAMEL_MAPI_FOLDER (folder);
- folder->summary = camel_mapi_folder_summary_new (folder);
+ folder_summary = camel_mapi_folder_summary_new (folder);
- if (!folder->summary) {
- g_object_unref (CAMEL_OBJECT (folder));
+ if (!folder_summary) {
+ g_object_unref (folder);
g_set_error (
error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
_("Could not load summary for %s"),
@@ -2109,6 +2047,8 @@ camel_mapi_folder_new (CamelStore *store,
return NULL;
}
+ camel_folder_take_folder_summary (folder, folder_summary);
+
/* set/load persistent state */
state_file = g_build_filename (folder_dir, short_name, "cmeta", NULL);
camel_object_set_state_filename (CAMEL_OBJECT (folder), state_file);
@@ -2129,7 +2069,7 @@ camel_mapi_folder_new (CamelStore *store,
fi = camel_store_get_folder_info_sync (store, folder_name, 0, NULL, NULL);
if (fi) {
if ((fi->flags & CAMEL_FOLDER_TYPE_MASK) == CAMEL_FOLDER_TYPE_INBOX) {
- folder->folder_flags |= CAMEL_FOLDER_FILTER_RECENT;
+ camel_folder_set_flags (folder, camel_folder_get_flags (folder) |
CAMEL_FOLDER_FILTER_RECENT);
}
camel_folder_info_free (fi);
@@ -2145,6 +2085,7 @@ camel_mapi_folder_new (CamelStore *store,
si = camel_store_summary_path (mapi_store->summary, folder_name);
if (si) {
CamelMapiStoreInfo *msi = (CamelMapiStoreInfo *) si;
+ guint32 add_folder_flags = 0;
mapi_folder->mapi_folder_flags = msi->mapi_folder_flags;
mapi_folder->camel_folder_flags = msi->camel_folder_flags;
@@ -2156,17 +2097,19 @@ camel_mapi_folder_new (CamelStore *store,
}
if ((si->flags & CAMEL_FOLDER_TYPE_MASK) == CAMEL_FOLDER_TYPE_TRASH)
- folder->folder_flags |= CAMEL_FOLDER_IS_TRASH;
+ add_folder_flags |= CAMEL_FOLDER_IS_TRASH;
else if ((si->flags & CAMEL_FOLDER_TYPE_MASK) == CAMEL_FOLDER_TYPE_JUNK)
- folder->folder_flags |= CAMEL_FOLDER_IS_JUNK;
+ add_folder_flags |= CAMEL_FOLDER_IS_JUNK;
camel_store_summary_info_unref (mapi_store->summary, si);
+
+ camel_folder_set_flags (folder, camel_folder_get_flags (folder) | add_folder_flags);
} else {
g_warning ("%s: cannot find '%s' in known folders", G_STRFUNC, folder_name);
}
camel_store_summary_connect_folder_summary (
((CamelMapiStore *) store)->summary,
- folder_name, folder->summary);
+ folder_name, folder_summary);
/* sanity checking */
if ((mapi_folder->mapi_folder_flags & CAMEL_MAPI_STORE_FOLDER_FLAG_FOREIGN) != 0)
diff --git a/src/camel/camel-mapi-message-info.c b/src/camel/camel-mapi-message-info.c
new file mode 100644
index 0000000..acf0a3e
--- /dev/null
+++ b/src/camel/camel-mapi-message-info.c
@@ -0,0 +1,306 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2016 Red Hat, Inc. (www.redhat.com)
+ *
+ * This library is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+
+#include "camel/camel.h"
+#include "camel-mapi-folder-summary.h"
+
+#include "camel-mapi-message-info.h"
+
+struct _CamelMapiMessageInfoPrivate {
+ guint32 server_flags;
+ gint64 last_modified; /* like time_t */
+};
+
+enum {
+ PROP_0,
+ PROP_SERVER_FLAGS,
+ PROP_LAST_MODIFIED
+};
+
+G_DEFINE_TYPE (CamelMapiMessageInfo, camel_mapi_message_info, CAMEL_TYPE_MESSAGE_INFO_BASE)
+
+static CamelMessageInfo *
+mapi_message_info_clone (const CamelMessageInfo *mi,
+ CamelFolderSummary *assign_summary)
+{
+ CamelMessageInfo *result;
+
+ g_return_val_if_fail (CAMEL_IS_MAPI_MESSAGE_INFO (mi), NULL);
+
+ result = CAMEL_MESSAGE_INFO_CLASS (camel_mapi_message_info_parent_class)->clone (mi, assign_summary);
+ if (!result)
+ return NULL;
+
+ if (CAMEL_IS_MAPI_MESSAGE_INFO (result)) {
+ CamelMapiMessageInfo *mmi, *mmi_result;
+
+ mmi = CAMEL_MAPI_MESSAGE_INFO (mi);
+ mmi_result = CAMEL_MAPI_MESSAGE_INFO (result);
+
+ /* safe-guard that the mmi's filename doesn't change before it's copied to mmi_result */
+ camel_message_info_property_lock (mi);
+
+ camel_mapi_message_info_set_server_flags (mmi_result,
camel_mapi_message_info_get_server_flags (mmi));
+ camel_mapi_message_info_set_last_modified (mmi_result,
camel_mapi_message_info_get_last_modified (mmi));
+
+ camel_message_info_property_unlock (mi);
+ }
+
+ return result;
+}
+
+static gboolean
+mapi_message_info_load (CamelMessageInfo *mi,
+ const CamelMIRecord *record,
+ /* const */ gchar **bdata_ptr)
+{
+ CamelMapiMessageInfo *mmi;
+
+ g_return_val_if_fail (CAMEL_IS_MAPI_MESSAGE_INFO (mi), FALSE);
+ g_return_val_if_fail (record != NULL, FALSE);
+ g_return_val_if_fail (bdata_ptr != NULL, FALSE);
+
+ if (!CAMEL_MESSAGE_INFO_CLASS (camel_mapi_message_info_parent_class)->load ||
+ !CAMEL_MESSAGE_INFO_CLASS (camel_mapi_message_info_parent_class)->load (mi, record, bdata_ptr))
+ return FALSE;
+
+ mmi = CAMEL_MAPI_MESSAGE_INFO (mi);
+
+ camel_mapi_message_info_set_server_flags (mmi, camel_util_bdata_get_number (bdata_ptr, 0));
+ camel_mapi_message_info_set_last_modified (mmi, camel_util_bdata_get_number (bdata_ptr, 0));
+
+ return TRUE;
+}
+
+static gboolean
+mapi_message_info_save (const CamelMessageInfo *mi,
+ CamelMIRecord *record,
+ GString *bdata_str)
+{
+ CamelMapiMessageInfo *mmi;
+
+ g_return_val_if_fail (CAMEL_IS_MAPI_MESSAGE_INFO (mi), FALSE);
+ g_return_val_if_fail (record != NULL, FALSE);
+ g_return_val_if_fail (bdata_str != NULL, FALSE);
+
+ if (!CAMEL_MESSAGE_INFO_CLASS (camel_mapi_message_info_parent_class)->save ||
+ !CAMEL_MESSAGE_INFO_CLASS (camel_mapi_message_info_parent_class)->save (mi, record, bdata_str))
+ return FALSE;
+
+ mmi = CAMEL_MAPI_MESSAGE_INFO (mi);
+
+ camel_util_bdata_put_number (bdata_str, camel_mapi_message_info_get_server_flags (mmi));
+ camel_util_bdata_put_number (bdata_str, camel_mapi_message_info_get_last_modified (mmi));
+
+ return TRUE;
+}
+
+static void
+mapi_message_info_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ CamelMapiMessageInfo *mmi = CAMEL_MAPI_MESSAGE_INFO (object);
+
+ switch (property_id) {
+ case PROP_SERVER_FLAGS:
+ camel_mapi_message_info_set_server_flags (mmi, g_value_get_uint (value));
+ return;
+
+ case PROP_LAST_MODIFIED:
+ camel_mapi_message_info_set_last_modified (mmi, g_value_get_int64 (value));
+ return;
+ }
+
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+}
+
+static void
+mapi_message_info_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ CamelMapiMessageInfo *mmi = CAMEL_MAPI_MESSAGE_INFO (object);
+
+ switch (property_id) {
+ case PROP_SERVER_FLAGS:
+ g_value_set_uint (value, camel_mapi_message_info_get_server_flags (mmi));
+ return;
+
+ case PROP_LAST_MODIFIED:
+ g_value_set_int64 (value, camel_mapi_message_info_get_last_modified (mmi));
+ return;
+ }
+
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+}
+
+static void
+camel_mapi_message_info_class_init (CamelMapiMessageInfoClass *class)
+{
+ CamelMessageInfoClass *mi_class;
+ GObjectClass *object_class;
+
+ g_type_class_add_private (class, sizeof (CamelMapiMessageInfoPrivate));
+
+ mi_class = CAMEL_MESSAGE_INFO_CLASS (class);
+ mi_class->clone = mapi_message_info_clone;
+ mi_class->load = mapi_message_info_load;
+ mi_class->save = mapi_message_info_save;
+
+ object_class = G_OBJECT_CLASS (class);
+ object_class->set_property = mapi_message_info_set_property;
+ object_class->get_property = mapi_message_info_get_property;
+
+ /**
+ * CamelMapiMessageInfo:server-flags
+ *
+ * Flags of the message on the server.
+ *
+ * Since: 3.24
+ **/
+ g_object_class_install_property (
+ object_class,
+ PROP_SERVER_FLAGS,
+ g_param_spec_uint (
+ "server-flags",
+ "Server Flags",
+ NULL,
+ 0, G_MAXUINT32, 0,
+ G_PARAM_READWRITE));
+
+ /**
+ * CamelMapiMessageInfo:last-modified
+ *
+ * PidTagLastModificationTime of this message.
+ *
+ * Since: 3.24
+ **/
+ g_object_class_install_property (
+ object_class,
+ PROP_LAST_MODIFIED,
+ g_param_spec_int64 (
+ "last-modified",
+ "Last Modified",
+ NULL,
+ G_MININT64, G_MAXINT64, 0,
+ G_PARAM_READWRITE));
+}
+
+static void
+camel_mapi_message_info_init (CamelMapiMessageInfo *mmi)
+{
+ mmi->priv = G_TYPE_INSTANCE_GET_PRIVATE (mmi, CAMEL_TYPE_MAPI_MESSAGE_INFO,
CamelMapiMessageInfoPrivate);
+}
+
+guint32
+camel_mapi_message_info_get_server_flags (const CamelMapiMessageInfo *mmi)
+{
+ CamelMessageInfo *mi;
+ guint32 result;
+
+ g_return_val_if_fail (CAMEL_IS_MAPI_MESSAGE_INFO (mmi), 0);
+
+ mi = CAMEL_MESSAGE_INFO (mmi);
+
+ camel_message_info_property_lock (mi);
+ result = mmi->priv->server_flags;
+ camel_message_info_property_unlock (mi);
+
+ return result;
+}
+
+gboolean
+camel_mapi_message_info_set_server_flags (CamelMapiMessageInfo *mmi,
+ guint32 server_flags)
+{
+ CamelMessageInfo *mi;
+ gboolean changed;
+
+ g_return_val_if_fail (CAMEL_IS_MAPI_MESSAGE_INFO (mmi), FALSE);
+
+ mi = CAMEL_MESSAGE_INFO (mmi);
+
+ camel_message_info_property_lock (mi);
+
+ changed = mmi->priv->server_flags != server_flags;
+
+ if (changed)
+ mmi->priv->server_flags = server_flags;
+
+ camel_message_info_property_unlock (mi);
+
+ if (changed && !camel_message_info_get_abort_notifications (mi)) {
+ g_object_notify (G_OBJECT (mmi), "server-flags");
+ camel_message_info_set_dirty (mi, TRUE);
+ }
+
+ return changed;
+}
+
+gint64
+camel_mapi_message_info_get_last_modified (const CamelMapiMessageInfo *mmi)
+{
+ CamelMessageInfo *mi;
+ gint64 result;
+
+ g_return_val_if_fail (CAMEL_IS_MAPI_MESSAGE_INFO (mmi), 0);
+
+ mi = CAMEL_MESSAGE_INFO (mmi);
+
+ camel_message_info_property_lock (mi);
+ result = mmi->priv->last_modified;
+ camel_message_info_property_unlock (mi);
+
+ return result;
+}
+
+gboolean
+camel_mapi_message_info_set_last_modified (CamelMapiMessageInfo *mmi,
+ gint64 last_modified)
+{
+ CamelMessageInfo *mi;
+ gboolean changed;
+
+ g_return_val_if_fail (CAMEL_IS_MAPI_MESSAGE_INFO (mmi), FALSE);
+
+ mi = CAMEL_MESSAGE_INFO (mmi);
+
+ camel_message_info_property_lock (mi);
+
+ changed = mmi->priv->last_modified != last_modified;
+
+ if (changed)
+ mmi->priv->last_modified = last_modified;
+
+ camel_message_info_property_unlock (mi);
+
+ if (changed && !camel_message_info_get_abort_notifications (mi)) {
+ g_object_notify (G_OBJECT (mmi), "last-modified");
+ camel_message_info_set_dirty (mi, TRUE);
+ }
+
+ return changed;
+}
diff --git a/src/camel/camel-mapi-message-info.h b/src/camel/camel-mapi-message-info.h
new file mode 100644
index 0000000..994c119
--- /dev/null
+++ b/src/camel/camel-mapi-message-info.h
@@ -0,0 +1,76 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2016 Red Hat, Inc. (www.redhat.com)
+ *
+ * This library is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CAMEL_MAPI_MESSAGE_INFO_H
+#define CAMEL_MAPI_MESSAGE_INFO_H
+
+#include <glib-object.h>
+
+#include <camel/camel.h>
+
+/* Standard GObject macros */
+#define CAMEL_TYPE_MAPI_MESSAGE_INFO \
+ (camel_mapi_message_info_get_type ())
+#define CAMEL_MAPI_MESSAGE_INFO(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), CAMEL_TYPE_MAPI_MESSAGE_INFO, CamelMapiMessageInfo))
+#define CAMEL_MAPI_MESSAGE_INFO_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), CAMEL_TYPE_MAPI_MESSAGE_INFO, CamelMapiMessageInfoClass))
+#define CAMEL_IS_MAPI_MESSAGE_INFO(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), CAMEL_TYPE_MAPI_MESSAGE_INFO))
+#define CAMEL_IS_MAPI_MESSAGE_INFO_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), CAMEL_TYPE_MAPI_MESSAGE_INFO))
+#define CAMEL_MAPI_MESSAGE_INFO_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), CAMEL_TYPE_MAPI_MESSAGE_INFO, CamelMapiMessageInfoClass))
+
+G_BEGIN_DECLS
+
+#define CAMEL_MAPI_MESSAGE_WITH_READ_RECEIPT (CAMEL_MESSAGE_FOLDER_FLAGGED << 1)
+
+typedef struct _CamelMapiMessageInfo CamelMapiMessageInfo;
+typedef struct _CamelMapiMessageInfoClass CamelMapiMessageInfoClass;
+typedef struct _CamelMapiMessageInfoPrivate CamelMapiMessageInfoPrivate;
+
+struct _CamelMapiMessageInfo {
+ CamelMessageInfoBase parent;
+ CamelMapiMessageInfoPrivate *priv;
+};
+
+struct _CamelMapiMessageInfoClass {
+ CamelMessageInfoBaseClass parent_class;
+};
+
+GType camel_mapi_message_info_get_type (void);
+
+guint32 camel_mapi_message_info_get_server_flags
+ (const CamelMapiMessageInfo *mmi);
+gboolean camel_mapi_message_info_set_server_flags
+ (CamelMapiMessageInfo *mmi,
+ guint32 server_flags);
+gint64 camel_mapi_message_info_get_last_modified
+ (const CamelMapiMessageInfo *mmi);
+gboolean camel_mapi_message_info_set_last_modified
+ (CamelMapiMessageInfo *mmi,
+ gint64 last_modified);
+
+G_END_DECLS
+
+#endif /* CAMEL_MAPI_MESSAGE_INFO_H */
diff --git a/src/camel/camel-mapi-store.c b/src/camel/camel-mapi-store.c
index 336ab5f..2a8a4d9 100644
--- a/src/camel/camel-mapi-store.c
+++ b/src/camel/camel-mapi-store.c
@@ -2088,10 +2088,9 @@ mapi_store_constructed (GObject *object)
/*priv->parent_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); / * folder ID
to its parent folder ID */
priv->default_folders = g_hash_table_new_full (g_int_hash, g_int_equal, g_free, g_free); /* default
folder type to folder ID */
priv->container_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
- store->flags &= ~CAMEL_STORE_VJUNK;
- store->flags &= ~CAMEL_STORE_VTRASH;
- store->flags |= CAMEL_STORE_REAL_JUNK_FOLDER | CAMEL_STORE_USE_CACHE_DIR;
+ camel_store_set_flags (store, (camel_store_get_flags (store) & ~(CAMEL_STORE_VJUNK |
CAMEL_STORE_VTRASH)) |
+ CAMEL_STORE_REAL_JUNK_FOLDER | CAMEL_STORE_USE_CACHE_DIR);
g_free (path);
}
diff --git a/src/libexchangemapi/e-mapi-mail-utils.c b/src/libexchangemapi/e-mapi-mail-utils.c
index 7f5d5ad..ef3155a 100644
--- a/src/libexchangemapi/e-mapi-mail-utils.c
+++ b/src/libexchangemapi/e-mapi-mail-utils.c
@@ -458,7 +458,7 @@ classify_attachments (EMapiConnection *conn,
if (!filename || !*filename)
filename = e_mapi_util_find_array_propval (&attach->properties, PidTagAttachFilename);
camel_mime_part_set_filename (part, filename);
- camel_content_type_set_param (((CamelDataWrapper *) part)->mime_type, "name", filename);
+ camel_content_type_set_param (camel_data_wrapper_get_mime_type_field (CAMEL_DATA_WRAPPER
(part)), "name", filename);
if (is_apple) {
CamelMultipart *mp;
@@ -778,20 +778,27 @@ e_mapi_mail_utils_object_to_message (EMapiConnection *conn, /* const */ EMapiObj
g_object_unref (stream);
if (camel_mime_part_construct_from_parser_sync (part, parser, NULL, NULL)) {
- struct _camel_header_raw *h;
+ const CamelNameValueArray *headers;
+ CamelMedium *msg_medium = CAMEL_MEDIUM (msg);
+ guint ii, len;
- for (h = part->headers; h; h = h->next) {
- const gchar *value = h->value;
+ headers = camel_medium_get_headers (CAMEL_MEDIUM (part));
+ len = camel_name_value_array_get_length (headers);
+
+ for (ii = 0; ii < len; ii++) {
+ const gchar *header_name = NULL, *header_value = NULL;
/* skip all headers describing content of a message,
because it's overwritten on message decomposition */
- if (g_ascii_strncasecmp (h->name, "Content", 7) == 0)
+ if (!camel_name_value_array_get (headers, ii, &header_name, &header_value) ||
+ !header_name ||
+ g_ascii_strncasecmp (header_name, "Content", 7) == 0)
continue;
- while (value && camel_mime_is_lwsp (*value))
- value++;
+ while (header_value && camel_mime_is_lwsp (*header_value))
+ header_value++;
- camel_medium_add_header (CAMEL_MEDIUM (msg), h->name, value);
+ camel_medium_add_header (msg_medium, header_name, header_value);
}
}
@@ -1553,7 +1560,7 @@ e_mapi_mail_utils_message_to_object (struct _CamelMimeMessage *message,
if ((create_flags & E_MAPI_CREATE_FLAG_SUBMIT) == 0) {
time_t msg_time = 0;
gint msg_time_offset = 0;
- GArray *headers;
+ CamelNameValueArray *headers;
if (namep && *namep)
set_value (PidTagSentRepresentingName, namep);
@@ -1583,20 +1590,24 @@ e_mapi_mail_utils_message_to_object (struct _CamelMimeMessage *message,
set_value (PidTagMessageDeliveryTime, &msg_date);
}
- headers = camel_medium_get_headers (CAMEL_MEDIUM (message));
+ headers = camel_medium_dup_headers (CAMEL_MEDIUM (message));
if (headers) {
GString *hstr = g_string_new ("");
+ guint len;
+
+ len = camel_name_value_array_get_length (headers);
- for (ii = 0; ii < headers->len; ii++) {
- CamelMediumHeader *h = &g_array_index (headers, CamelMediumHeader, ii);
+ for (ii = 0; ii < len; ii++) {
+ const gchar *header_name = NULL, *header_value = NULL;
- if (!h->name || !*h->name || g_ascii_strncasecmp (h->name, "X-Evolution", 11)
== 0)
+ if (!camel_name_value_array_get (headers, ii, &header_name, &header_value) ||
+ !header_name || !*header_name || g_ascii_strncasecmp (header_name,
"X-Evolution", 11) == 0)
continue;
- g_string_append_printf (hstr, "%s: %s\n", h->name, h->value ? h->value : "");
+ g_string_append_printf (hstr, "%s: %s\n", header_name, header_value ?
header_value : "");
}
- camel_medium_free_headers (CAMEL_MEDIUM (message), headers);
+ camel_name_value_array_free (headers);
if (hstr->len && hstr->str)
set_value (PidTagTransportMessageHeaders, hstr->str);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
