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

diff --git a/src/modest-formatter.c b/src/modest-formatter.c
index dd1efe0..f1f5aff 100644
--- a/src/modest-formatter.c
+++ b/src/modest-formatter.c
@@ -33,11 +33,11 @@
 #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>
+#include "modest-runtime.h"
+#include "modest-stream-html-to-text.h"
 
 #define LINE_WRAP 78
 #define MAX_BODY_LINES 1024
@@ -73,20 +73,23 @@ extract_text (ModestFormatter *self, TnyMimePart *body)
 {
 	TnyStream *mp_stream;
 	TnyStream *stream;
-	TnyStream *input_stream;
+	TnyStream *input_stream = NULL;
 	GtkTextBuffer *buf;
 	GtkTextIter start, end;
 	gchar *text;
 	ModestFormatterPrivate *priv;
-	gint total, total_lines, line_chars;
+	gint total, lines, total_lines, line_chars;
+	gboolean is_html, first_time;
+	gboolean forced_wrap;
 
 	buf = gtk_text_buffer_new (NULL);
 	stream = TNY_STREAM (tny_gtk_text_buffer_stream_new (buf));
 	tny_stream_reset (stream);
 	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);
+	is_html = (g_strcmp0 (tny_mime_part_get_content_type (body), "text/html") == 0);
+	if (is_html) {
+		input_stream = modest_stream_html_to_text_new (mp_stream);
 	} else {
 		input_stream = g_object_ref (mp_stream);
 	}
@@ -94,7 +97,10 @@ extract_text (ModestFormatter *self, TnyMimePart *body)
 	total = 0;
 	total_lines = 0;
 	line_chars = 0;
+	lines = 0;
 
+	forced_wrap = FALSE;
+	first_time = TRUE;
 	while (!tny_stream_is_eos (input_stream)) {
 		gchar buffer [128];
 		gchar *offset;
@@ -111,15 +117,19 @@ extract_text (ModestFormatter *self, TnyMimePart *body)
 
 		offset = buffer;
 		while (offset < buffer + n_read) {
-			
-			if (*offset == '\n') {
+
+			if (*offset == '\n' && !(forced_wrap && offset[1] == '\n')) {
 				total_lines ++;
 				line_chars = 0;
 			} else {
+				if (*offset == '\n') {
+					forced_wrap = FALSE;
+				}
 				line_chars ++;
 				if (line_chars >= LINE_WRAP) {
 					total_lines ++;
 					line_chars = 0;
+					forced_wrap = TRUE;
 				}
 			}
 			if (total_lines >= MAX_BODY_LINES)
@@ -127,11 +137,11 @@ extract_text (ModestFormatter *self, TnyMimePart *body)
 			offset++;
 		}
 
-		
-
 		if (offset - buffer > 0) {
-			gint n_write;
-			n_write = tny_stream_write (stream, buffer, offset - buffer);
+			gint n_write = 0, to_write = 0;
+
+			to_write = offset - buffer;
+			n_write = tny_stream_write (stream, buffer, to_write);
 			total += n_write;
 		} else if (n_read == -1) {
 			break;
@@ -146,7 +156,7 @@ extract_text (ModestFormatter *self, TnyMimePart *body)
 	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);
 	g_object_unref (G_OBJECT(buf));
@@ -203,7 +213,7 @@ modest_formatter_do (ModestFormatter *self, TnyMimePart *body, TnyHeader *header
 	priv = MODEST_FORMATTER_GET_PRIVATE (self);
 	construct_from_text (TNY_MIME_PART (body_part), (const gchar*) txt, priv->content_type);
 	g_object_unref (body_part);
-	
+
 	/* Clean */
 	g_free (body_text);
 	g_free (txt);
@@ -417,7 +427,7 @@ modest_formatter_wrapper_quote (ModestFormatter *self, const gchar *text, TnyHea
 					  from,
 					  tny_header_get_date_sent (header),
 					  filenames,
-					  80);
+					  72);
 	g_free (from);
 
 	g_list_foreach (filenames, (GFunc) g_free, NULL);