On creating forward, don't include purged parts (fixes NB#124831).

[modest] / src / modest-formatter.c

diff --git a/src/modest-formatter.c b/src/modest-formatter.c
index 6eabe57..8cdd091 100644 (file)
--- a/src/modest-formatter.c
+++ b/src/modest-formatter.c
@@ -39,7 +39,9 @@
 #include "modest-tny-platform-factory.h"
 #include <modest-runtime.h>
 
-#define MAX_BODY_LENGTH 4096
+#define LINE_WRAP 78
+#define MAX_BODY_LINES 1024
+#define MAX_BODY_LENGTH 1024*128
 
 typedef struct _ModestFormatterPrivate ModestFormatterPrivate;
 struct _ModestFormatterPrivate {
@@ -74,9 +76,9 @@ extract_text (ModestFormatter *self, TnyMimePart *body)
        TnyStream *input_stream;
        GtkTextBuffer *buf;
        GtkTextIter start, end;
-       gchar *text, *converted_text;
+       gchar *text;
        ModestFormatterPrivate *priv;
-       gint total;
+       gint total, total_lines, line_chars;
 
        buf = gtk_text_buffer_new (NULL);
        stream = TNY_STREAM (tny_gtk_text_buffer_stream_new (buf));
@@ -90,9 +92,12 @@ extract_text (ModestFormatter *self, TnyMimePart *body)
        }
 
        total = 0;
+       total_lines = 0;
+       line_chars = 0;
 
        while (!tny_stream_is_eos (input_stream)) {
                gchar buffer [128];
+               gchar *offset;
                gint n_read;
                gint next_read;
 
@@ -100,13 +105,37 @@ extract_text (ModestFormatter *self, TnyMimePart *body)
                if (next_read == 0)
                        break;
                n_read = tny_stream_read (input_stream, buffer, next_read);
-               if (n_read > 0) {
+
+               offset = buffer;
+               while (offset < buffer + n_read) {
+                       
+                       if (*offset == '\n') {
+                               total_lines ++;
+                               line_chars = 0;
+                       } else {
+                               line_chars ++;
+                               if (line_chars >= LINE_WRAP) {
+                                       total_lines ++;
+                                       line_chars = 0;
+                               }
+                       }
+                       if (total_lines >= MAX_BODY_LINES)
+                               break;
+                       offset++;
+               }
+
+               
+
+               if (offset - buffer > 0) {
                        gint n_write;
-                       n_write = tny_stream_write (stream, buffer, n_read);
+                       n_write = tny_stream_write (stream, buffer, offset - buffer);
                        total += n_write;
                } else if (n_read == -1) {
                        break;
                }
+
+               if (total_lines >= MAX_BODY_LINES)
+                       break;
        }
 
        tny_stream_reset (stream);
@@ -122,15 +151,6 @@ extract_text (ModestFormatter *self, TnyMimePart *body)
        /* Convert to desired content type if needed */
        priv = MODEST_FORMATTER_GET_PRIVATE (self);
 
-       if (strcmp (tny_mime_part_get_content_type (body), priv->content_type) == 0) {
-               if (!strcmp (priv->content_type, "text/html"))
-                       converted_text = modest_text_utils_convert_to_html  (text);
-               else
-                       converted_text = g_strdup (text);
-
-               g_free (text);
-               text = converted_text;
-       }
        return text;
 }
 
@@ -206,6 +226,32 @@ modest_formatter_inline (ModestFormatter *self, TnyMimePart *body, TnyHeader *he
        return modest_formatter_do (self, body, header, modest_formatter_wrapper_inline, attachments);
 }
 
+static void
+remove_purgeds (TnyMimePart *part)
+{
+       TnyList *parts;
+       TnyIterator *iterator;
+
+       parts = TNY_LIST (tny_simple_list_new ());
+       tny_mime_part_get_parts (part, parts);
+
+       for (iterator = tny_list_create_iterator (parts);
+            !tny_iterator_is_done (iterator);
+            tny_iterator_next (iterator)) {
+               TnyMimePart *current;
+
+               current = (TnyMimePart *) tny_iterator_get_current (iterator);
+               if (tny_mime_part_is_purged (current)) {
+                       tny_mime_part_del_part (part, current);
+               }
+
+               g_object_unref (current);
+       }
+
+       g_object_unref (iterator);
+       g_object_unref (parts);
+}
+
 TnyMsg *
 modest_formatter_attach (ModestFormatter *self, TnyMsg *msg, TnyHeader *header)
 {
@@ -227,6 +273,10 @@ modest_formatter_attach (ModestFormatter *self, TnyMsg *msg, TnyHeader *header)
        g_object_unref (body_part);
 
        if (msg) {
+
+               /* Remove purgeds */
+               remove_purgeds (TNY_MIME_PART (msg));
+
                /* Add parts */
                tny_mime_part_add_part (TNY_MIME_PART (new_msg), TNY_MIME_PART (msg));
        }