callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EMailParserMessage: Better handle message bodies as attachments.

Browse Source 
Simo Sorce sent me an interesting case where the MIME type of the
message itself was image/gif, but the image was not being shown.

If the EMailPart representing the message body is marked as an
attachment, wrap it as such so it gets added to the attachment
bar but also set the "force_inline" flag since it doesn't make
sense to collapse the message body if we can render it. */
This commit is contained in:
Matthew Barnes
2013-07-08 17:57:19 -04:00
parent 0ac936cfe3
commit 514736f27e
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
em-format/e-mail-parser-message.c
View File

@ -52,7 +52,9 @@ empe_message_parse (EMailParserExtension *extension,
GCancellable *cancellable,
GQueue *out_mail_parts)
{
GQueue work_queue = G_QUEUE_INIT;
CamelContentType *ct;
EMailPart *mail_part;
gchar *mime_type;
/* Headers */
@ -85,9 +87,29 @@ empe_message_parse (EMailParserExtension *extension,
}
/* Actual message body */
e_mail_parser_parse_part_as (
parser, part, part_id, mime_type,
cancellable, out_mail_parts);
cancellable, &work_queue);
/* If the EMailPart representing the message body is marked as an
* attachment, wrap it as such so it gets added to the attachment
* bar but also set the "force_inline" flag since it doesn't make
* sense to collapse the message body if we can render it. */
mail_part = g_queue_peek_head (&work_queue);
if (mail_part != NULL) {
if (e_mail_part_get_is_attachment (mail_part)) {
e_mail_parser_wrap_as_attachment (
parser, part, part_id, &work_queue);
mail_part = g_queue_peek_head (&work_queue);
if (mail_part != NULL)
mail_part->force_inline = TRUE;
}
}
e_queue_transfer (&work_queue, out_mail_parts);
g_free (mime_type);