[evolution-data-server] Bug #606316 - Mail with an attachment in a Junk folder crashes Evo
- From: Milan Crha <mcrha src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Bug #606316 - Mail with an attachment in a Junk folder crashes Evo
- Date: Thu, 7 Jan 2010 17:33:21 +0000 (UTC)
commit 93f3612b2b89d296e2ff8d690f5ee566851122a9
Author: Milan Crha <mcrha redhat com>
Date: Thu Jan 7 18:30:34 2010 +0100
Bug #606316 - Mail with an attachment in a Junk folder crashes Evo
camel/camel-folder-summary.c | 9 +++++----
camel/camel-folder-summary.h | 4 +++-
2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index 47fc5e6..8033830 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -4628,6 +4628,8 @@ info_ptr(const CamelMessageInfo *mi, gint id)
return ((const CamelMessageInfoBase *)mi)->user_tags;
case CAMEL_MESSAGE_INFO_HEADERS:
return ((const CamelMessageInfoBase *)mi)->headers;
+ case CAMEL_MESSAGE_INFO_CONTENT:
+ return ((const CamelMessageInfoBase *)mi)->content;
case CAMEL_MESSAGE_INFO_PREVIEW:
return ((const CamelMessageInfoBase *)mi)->preview;
@@ -5076,14 +5078,13 @@ match_content_type (CamelContentType *info_ctype, CamelContentType *ctype)
return TRUE;
}
-CamelMessageContentInfo *
+const CamelMessageContentInfo *
camel_folder_summary_guess_content_info (CamelMessageInfo *mi, CamelContentType *ctype)
{
- CamelMessageInfoBase *bmi = (CamelMessageInfoBase *) mi;
- CamelMessageContentInfo *ci = bmi->content;
+ const CamelMessageContentInfo *ci = camel_message_info_content (mi);
while (ci) {
- CamelMessageContentInfo *child = ci;
+ const CamelMessageContentInfo *child = ci;
do {
if (match_content_type (child->type, ctype))
diff --git a/camel/camel-folder-summary.h b/camel/camel-folder-summary.h
index aa9a2fd..c0e1eb6 100644
--- a/camel/camel-folder-summary.h
+++ b/camel/camel-folder-summary.h
@@ -142,6 +142,7 @@ enum {
CAMEL_MESSAGE_INFO_HEADERS,
CAMEL_MESSAGE_INFO_PREVIEW,
+ CAMEL_MESSAGE_INFO_CONTENT,
CAMEL_MESSAGE_INFO_LAST
};
@@ -463,6 +464,7 @@ time_t camel_message_info_time(const CamelMessageInfo *mi, gint id);
#define camel_message_info_user_tags(mi) ((const CamelTag *)camel_message_info_ptr((const CamelMessageInfo *)mi, CAMEL_MESSAGE_INFO_USER_TAGS))
#define camel_message_info_headers(mi) ((const struct _camel_header_param *)camel_message_info_ptr((const CamelMessageInfo *)mi, CAMEL_MESSAGE_INFO_HEADERS))
+#define camel_message_info_content(mi) ((const CamelMessageContentInfo *)camel_message_info_ptr((const CamelMessageInfo *)mi, CAMEL_MESSAGE_INFO_CONTENT))
gboolean camel_message_info_user_flag(const CamelMessageInfo *mi, const gchar *id);
const gchar *camel_message_info_user_tag(const CamelMessageInfo *mi, const gchar *id);
@@ -475,7 +477,7 @@ void camel_folder_summary_set_need_preview (CamelFolderSummary *summary, gboolea
void camel_folder_summary_add_preview (CamelFolderSummary *s, CamelMessageInfo *info);
gboolean camel_folder_summary_get_need_preview (CamelFolderSummary *summary);
-CamelMessageContentInfo * camel_folder_summary_guess_content_info (CamelMessageInfo *mi, CamelContentType *ctype);
+const CamelMessageContentInfo * camel_folder_summary_guess_content_info (CamelMessageInfo *mi, CamelContentType *ctype);
/* debugging functions */
void camel_content_info_dump (CamelMessageContentInfo *ci, gint depth);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]