[evolution/wip/webkit2] Bug 736950 - Message with empty body and attachment shows body as attachment.dat

[Tomas Popela <tpopela src gnome org>]

commit d6d8c4a70ea6aa0067a3ff7b6202824644484b80
Author: Milan Crha <mcrha redhat com>
Date:   Wed Nov 19 21:47:54 2014 +0100

    Bug 736950 - Message with empty body and attachment shows body as attachment.dat

 em-format/e-mail-parser-multipart-mixed.c |    5 +++--
 em-format/e-mail-parser-text-plain.c      |   26 --------------------------
 2 files changed, 3 insertions(+), 28 deletions(-)
---
diff --git a/em-format/e-mail-parser-multipart-mixed.c b/em-format/e-mail-parser-multipart-mixed.c
index ad94895..432fef4 100644
--- a/em-format/e-mail-parser-multipart-mixed.c
+++ b/em-format/e-mail-parser-multipart-mixed.c
@@ -69,12 +69,13 @@ empe_mp_mixed_parse (EMailParserExtension *extension,
                EMailPart *mail_part;
                CamelMimePart *subpart;
                CamelContentType *ct;
+               gboolean handled;
 
                subpart = camel_multipart_get_part (mp, i);
 
                g_string_append_printf (part_id, ".mixed.%d", i);
 
-               e_mail_parser_parse_part (
+               handled = e_mail_parser_parse_part (
                        parser, subpart, part_id, cancellable, &work_queue);
 
                mail_part = g_queue_peek_head (&work_queue);
@@ -95,7 +96,7 @@ empe_mp_mixed_parse (EMailParserExtension *extension,
                                parser, subpart, part_id, &work_queue);
 
                /* Force messages to be expandable */
-               } else if (mail_part == NULL ||
+               } else if ((mail_part == NULL && !handled) ||
                    (camel_content_type_is (ct, "message", "*") &&
                     mail_part != NULL &&
                     !e_mail_part_get_is_attachment (mail_part))) {
diff --git a/em-format/e-mail-parser-text-plain.c b/em-format/e-mail-parser-text-plain.c
index 26e459c..7fbc59c 100644
--- a/em-format/e-mail-parser-text-plain.c
+++ b/em-format/e-mail-parser-text-plain.c
@@ -45,29 +45,6 @@ static const gchar *parser_mime_types[] = {
 };
 
 static gboolean
-part_is_empty (CamelMimePart *part)
-{
-       CamelDataWrapper *dw;
-       GByteArray *ba;
-       guint i;
-
-       dw = camel_medium_get_content (CAMEL_MEDIUM (part));
-       ba = camel_data_wrapper_get_byte_array (dw);
-
-       if (!ba)
-               return TRUE;
-
-       for (i = 0; i < ba->len; i++) {
-
-               /* Checks for \n, \t, \f, \r, \v and space */
-               if (!isspace (ba->data[i]))
-                       return FALSE;
-       }
-
-       return TRUE;
-}
-
-static gboolean
 process_part (EMailParser *parser,
               GString *part_id,
               gint part_number,
@@ -80,9 +57,6 @@ process_part (EMailParser *parser,
        EMailPart *mail_part;
        gint s_len = part_id->len;
 
-       if (part_is_empty (part))
-               return TRUE;
-
        type = camel_mime_part_get_content_type (part);
        if (!camel_content_type_is (type, "text", "*")) {
                e_mail_parser_parse_part (