X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-formatter.c;h=dd1efe0bc7126a3d222d245796ec3d5a8b953112;hp=f2ecfd92b2e45b3a6a0348b78be8c12b84c923f6;hb=e129368a3e2973c9492b9806c33ad30c25edca66;hpb=a257b9e8b31184a663ccb7676362d4ac2cb1b039

diff --git a/src/modest-formatter.c b/src/modest-formatter.c
index f2ecfd9..dd1efe0 100644
--- a/src/modest-formatter.c
+++ b/src/modest-formatter.c
@@ -33,11 +33,16 @@
 #include <tny-simple-list.h>
 #include <tny-gtk-text-buffer-stream.h>
 #include <tny-camel-mem-stream.h>
+#include <tny-camel-html-to-text-stream.h>
 #include "modest-formatter.h"
 #include "modest-text-utils.h"
 #include "modest-tny-platform-factory.h"
 #include <modest-runtime.h>
 
+#define LINE_WRAP 78
+#define MAX_BODY_LINES 1024
+#define MAX_BODY_LENGTH 1024*128
+
 typedef struct _ModestFormatterPrivate ModestFormatterPrivate;
 struct _ModestFormatterPrivate {
 	gchar *content_type;
@@ -66,19 +71,81 @@ static TnyMimePart *find_body_parent (TnyMimePart *part);
 static gchar *
 extract_text (ModestFormatter *self, TnyMimePart *body)
 {
+	TnyStream *mp_stream;
 	TnyStream *stream;
+	TnyStream *input_stream;
 	GtkTextBuffer *buf;
 	GtkTextIter start, end;
-	gchar *text, *converted_text;
+	gchar *text;
 	ModestFormatterPrivate *priv;
+	gint total, total_lines, line_chars;
 
 	buf = gtk_text_buffer_new (NULL);
 	stream = TNY_STREAM (tny_gtk_text_buffer_stream_new (buf));
 	tny_stream_reset (stream);
-	tny_mime_part_decode_to_stream (body, stream, NULL);
+	mp_stream = tny_mime_part_get_decoded_stream (body);
+
+	if (g_strcmp0 (tny_mime_part_get_content_type (body), "text/html") == 0) {
+		input_stream = tny_camel_html_to_text_stream_new (mp_stream);
+	} else {
+		input_stream = g_object_ref (mp_stream);
+	}
+
+	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;
+
+		next_read = MIN (128, MAX_BODY_LENGTH - total);
+		if (next_read == 0)
+			break;
+		n_read = tny_stream_read (input_stream, buffer, next_read);
+
+		if (G_UNLIKELY (n_read < 0))
+			break;
+
+		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, offset - buffer);
+			total += n_write;
+		} else if (n_read == -1) {
+			break;
+		}
+
+		if (total_lines >= MAX_BODY_LINES)
+			break;
+	}
+
 	tny_stream_reset (stream);
 
 	g_object_unref (G_OBJECT(stream));
+	g_object_unref (G_OBJECT (mp_stream));
+	g_object_unref (G_OBJECT (input_stream));
 	
 	gtk_text_buffer_get_bounds (buf, &start, &end);
 	text = gtk_text_buffer_get_text (buf, &start, &end, FALSE);
@@ -87,15 +154,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;
 }
 
@@ -220,6 +278,7 @@ modest_formatter_instance_init (GTypeInstance *instance, gpointer g_class)
 	ModestFormatterPrivate *priv = MODEST_FORMATTER_GET_PRIVATE (self);
 
 	priv->content_type = NULL;
+	priv->signature = NULL;
 }
 
 static void
@@ -327,7 +386,7 @@ modest_formatter_wrapper_quote (ModestFormatter *self, const gchar *text, TnyHea
 	GList *node = NULL;
 	gchar *result = NULL;
 	gchar *from;
-       
+
 	/* First we need a GList of attachments filenames */
 	for (node = attachments; node != NULL; node = g_list_next (node)) {
 		TnyMimePart *part = (TnyMimePart *) node->data;
@@ -342,12 +401,13 @@ modest_formatter_wrapper_quote (ModestFormatter *self, const gchar *text, TnyHea
 			g_object_unref (header);
 		} else {
 			filename = g_strdup (tny_mime_part_get_filename (part));
-			if ((filename == NULL)||(filename[0] == '\0'))
+			if ((filename == NULL)||(filename[0] == '\0')) {
+				g_free (filename);
 				filename = g_strdup ("");
+			}
 		}
-		filenames = g_list_append (filenames, filename);
+		filenames = g_list_prepend (filenames, filename);
 	}
-	filenames = g_list_reverse (filenames);
 
 	/* TODO: get 80 from the configuration */
 	from = tny_header_dup_from (header);
@@ -418,7 +478,7 @@ find_body_parent (TnyMimePart *part)
 	msg_content_type = tny_mime_part_get_content_type (part);
 
 	if ((msg_content_type != NULL) &&
-	    (!g_strcasecmp (msg_content_type, "multipart/alternative")))
+	    (!g_ascii_strcasecmp (msg_content_type, "multipart/alternative")))
 		return g_object_ref (part);
 	else if ((msg_content_type != NULL) &&
 		 (g_str_has_prefix (msg_content_type, "multipart/"))) {
@@ -431,10 +491,10 @@ find_body_parent (TnyMimePart *part)
 
 		while (!tny_iterator_is_done (iter)) {
 			TnyMimePart *part = TNY_MIME_PART (tny_iterator_get_current (iter));
-			if (part && !g_strcasecmp(tny_mime_part_get_content_type (part), "multipart/alternative")) {
+			if (part && !g_ascii_strcasecmp(tny_mime_part_get_content_type (part), "multipart/alternative")) {
 				alternative_part = part;
 				break;
-			} else if (part && !g_strcasecmp (tny_mime_part_get_content_type (part), "multipart/related")) {
+			} else if (part && !g_ascii_strcasecmp (tny_mime_part_get_content_type (part), "multipart/related")) {
 				related_part = part;
 				break;
 			}