* src/modest-formatter.c

[modest] / src / modest-tny-msg.c

diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c
index 48b2108..e521233 100644 (file)
--- a/src/modest-tny-msg.c
+++ b/src/modest-tny-msg.c
@@ -34,10 +34,8 @@
 #include <tny-folder.h>
 #include <modest-runtime.h>
 #include "modest-formatter.h"
-#include <tny-camel-stream.h>
+#include <tny-camel-mem-stream.h>
 #include <tny-camel-mime-part.h>
-#include <camel/camel-stream-buffer.h>
-#include <camel/camel-stream-mem.h>
 #include <glib/gprintf.h>
 #include <modest-tny-folder.h>
 #include "modest-tny-mime-part.h"
@@ -171,9 +169,8 @@ add_body_part (TnyMsg *msg,
        TnyStream *text_body_stream;
 
        /* Create the stream */
-       text_body_stream = TNY_STREAM (tny_camel_stream_new
-                                      (camel_stream_mem_new_with_buffer
-                                       (body, (body ? strlen(body) : 0))));
+       text_body_stream = TNY_STREAM (tny_camel_mem_stream_new_with_buffer
+                                       (body, (body ? strlen(body) : 0)));
 
        text_body_part = modest_formatter_create_body_part (NULL, msg);
 
@@ -200,9 +197,8 @@ add_html_body_part (TnyMsg *msg,
        TnyStream *html_body_stream;
 
        /* Create the stream */
-       html_body_stream = TNY_STREAM (tny_camel_stream_new
-                                      (camel_stream_mem_new_with_buffer
-                                       (body, strlen(body))));
+       html_body_stream = TNY_STREAM (tny_camel_mem_stream_new_with_buffer
+                                       (body, strlen(body)));
 
        /* Create body part if needed */
        html_body_part = modest_formatter_create_body_part (NULL, msg);
@@ -251,7 +247,7 @@ copy_mime_part (TnyMimePart *part)
        attachment_cid = tny_mime_part_get_content_id (part);
        
        /* fill the stream */
-       attachment_stream = tny_mime_part_get_stream (part);
+       attachment_stream = tny_mime_part_get_decoded_stream (part);
        enc = tny_mime_part_get_transfer_encoding (part);
        tny_stream_reset (attachment_stream);
        tny_mime_part_construct (result,
@@ -401,10 +397,27 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht
        TnyMimePart *part = NULL;
        TnyList *parts = NULL;
        TnyIterator *iter = NULL;
+       gchar *header_content_type;
+       gchar *header_content_type_lower;
        
        if (!msg)
                return NULL;
 
+       /* If it's an application multipart, then we don't get into as we don't
+        * support them (for example application/sml or wap messages */
+       header_content_type = modest_tny_mime_part_get_header_value (msg, "Content-Type");
+       header_content_type = g_strstrip (header_content_type);
+       header_content_type_lower = header_content_type?g_ascii_strdown (header_content_type, -1):NULL;
+       if (header_content_type_lower && 
+           g_str_has_prefix (header_content_type_lower, "multipart/") &&
+           strstr (header_content_type_lower, "application/")) {
+               g_free (header_content_type_lower);
+               g_free (header_content_type);
+               return NULL;
+       }
+       g_free (header_content_type_lower);
+       g_free (header_content_type);
+
        parts = TNY_LIST (tny_simple_list_new());
        tny_mime_part_get_parts (TNY_MIME_PART (msg), parts);
 
@@ -412,8 +425,15 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht
 
        /* no parts? assume it's single-part message */
        if (tny_iterator_is_done(iter)) {
+               const gchar *content_type;
                g_object_unref (G_OBJECT(iter));
-               return TNY_MIME_PART (g_object_ref(G_OBJECT(msg)));
+               content_type = tny_mime_part_get_content_type (msg);
+               /* if this part cannot be a supported body return NULL */
+               if (!g_str_has_prefix (content_type, "text/")) {
+                       return NULL;
+               } else {
+                       return TNY_MIME_PART (g_object_ref(G_OBJECT(msg)));
+               }
        } else {
                do {
                        gchar *tmp, *content_type = NULL;
@@ -542,11 +562,12 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from,
        else {
                /* for attachements; inline if there is a text part, and include the
                 * full old mail if there was none */
-               if (no_text_part) 
+               if (no_text_part) {
                        new_msg = modest_formatter_attach (formatter, msg, header);
-               else 
+               } else { 
                        new_msg = modest_formatter_inline  (formatter, body, header,
                                                            attachments);
+               }
        }
        
        g_object_unref (G_OBJECT(formatter));
@@ -589,6 +610,10 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from,
        g_object_unref (G_OBJECT (header));
        /* ugly to unref it here instead of in the calling func */
 
+       if (!is_reply & !no_text_part) {
+               add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE);
+       }
+
        return new_msg;
 }
 
@@ -636,7 +661,6 @@ modest_tny_msg_create_forward_msg (TnyMsg *msg,
 
        new_msg = create_reply_forward_mail (msg, NULL, from, signature, FALSE, forward_type,
                                             attachments_list);
-       add_attachments (TNY_MIME_PART (new_msg), attachments_list, FALSE);
 
        /* Clean */
        if (attachments_list) {
@@ -781,7 +805,7 @@ modest_tny_msg_create_reply_msg (TnyMsg *msg,
 
        new_msg = create_reply_forward_mail (msg, header, from, signature, TRUE, reply_type,
                                             attachments_list);
-       if (attachments_list) {
+       if (attachments_list != NULL) {
                g_list_foreach (attachments_list, (GFunc) g_object_unref, NULL);
                g_list_free (attachments_list);
        }