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

diff --git a/src/modest-formatter.c b/src/modest-formatter.c
index 6eabe57..dd1efe0 100644
--- 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,40 @@ 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) {
+
+		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, 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 +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;
 }
 
@@ -455,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/"))) {
@@ -468,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;
 			}