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

Bug #724437 - Content-Disposition inline confuses message formatter

Browse Source
This commit is contained in:
Milan Crha
2014-02-18 12:37:12 +01:00
parent 3219d7a8e3
commit bc2fd7b356
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,7 @@
#include <libemail-engine/libemail-engine.h>
#include "e-mail-parser-extension.h"
#include "e-mail-part-attachment.h"
#include "e-mail-part-utils.h"
typedef EMailParserExtension EMailParserMessage;
@ -96,7 +97,7 @@ empe_message_parse (EMailParserExtension *extension,
* 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 (mail_part != NULL && !E_IS_MAIL_PART_ATTACHMENT (mail_part)) {
if (e_mail_part_get_is_attachment (mail_part)) {
e_mail_parser_wrap_as_attachment (
parser, part, part_id, &work_queue);

5
em-format/e-mail-part-utils.c
View File

@ -533,8 +533,10 @@ e_mail_part_is_inline (CamelMimePart *mime_part,
EMailParserExtension *extension;
EMailParserExtensionClass *class;
disposition = camel_mime_part_get_disposition (mime_part);
if ((extensions == NULL) || g_queue_is_empty (extensions))
return FALSE;
return disposition && g_ascii_strcasecmp (disposition, "inline") == 0;
extension = g_queue_peek_head (extensions);
class = E_MAIL_PARSER_EXTENSION_GET_CLASS (extension);
@ -544,7 +546,6 @@ e_mail_part_is_inline (CamelMimePart *mime_part,
if (class->flags & E_MAIL_PARSER_EXTENSION_INLINE_DISPOSITION)
return TRUE;
disposition = camel_mime_part_get_disposition (mime_part);
if (disposition != NULL)
return g_ascii_strcasecmp (disposition, "inline") == 0;