X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-formatter.c;h=4c125329221206c3b4616f0a0436b897d4b00ff1;hp=82418eda8c512573016736f6821af2b0983d20f8;hb=57d7b1d1ecf43e0ca885d0afc336cca8e94f7836;hpb=1c1f915919bf799f82dacb25a12d2fe7c2a93d0e

diff --git a/src/modest-formatter.c b/src/modest-formatter.c
index 82418ed..4c12532 100644
--- a/src/modest-formatter.c
+++ b/src/modest-formatter.c
@@ -33,11 +33,14 @@
 #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 MAX_BODY_LENGTH 4096
+
 typedef struct _ModestFormatterPrivate ModestFormatterPrivate;
 struct _ModestFormatterPrivate {
 	gchar *content_type;
@@ -66,19 +69,51 @@ 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;
 
 	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;
+
+	while (!tny_stream_is_eos (input_stream)) {
+		gchar buffer [128];
+		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 (n_read > 0) {
+			gint n_write;
+			n_write = tny_stream_write (stream, buffer, n_read);
+			total += n_write;
+		} else if (n_read == -1) {
+			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 +122,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;
 }