X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-formatter.c;h=5392b062486d9c3890f2cfdb5b458e2fd8a5120f;hp=8eb4c752fe45e55d079e5ad21365eae74f09acf2;hb=8f4797391e5962158a0a085646f1d24da887ee3d;hpb=5b68f7c4a513a7a6f45549e7bf40838ce754db27

diff --git a/src/modest-formatter.c b/src/modest-formatter.c
index 8eb4c75..5392b06 100644
--- a/src/modest-formatter.c
+++ b/src/modest-formatter.c
@@ -38,6 +38,8 @@
 #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,16 +68,39 @@ static TnyMimePart *find_body_parent (TnyMimePart *part);
 static gchar *
 extract_text (ModestFormatter *self, TnyMimePart *body)
 {
+	TnyStream *mp_stream;
 	TnyStream *stream;
 	GtkTextBuffer *buf;
 	GtkTextIter start, end;
 	gchar *text, *converted_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);
+
+	total = 0;
+
+	while (!tny_stream_is_eos (mp_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 (mp_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));
@@ -177,6 +202,7 @@ modest_formatter_attach (ModestFormatter *self, TnyMsg *msg, TnyHeader *header)
 	TnyMsg *new_msg = NULL;
 	TnyMimePart *body_part = NULL;
 	ModestFormatterPrivate *priv;
+	gchar *txt;
 
 	/* Build new part */
 	new_msg     = modest_formatter_create_message (self, TRUE, TRUE, FALSE);
@@ -184,7 +210,10 @@ modest_formatter_attach (ModestFormatter *self, TnyMsg *msg, TnyHeader *header)
 
 	/* Create the two parts */
 	priv = MODEST_FORMATTER_GET_PRIVATE (self);
-	construct_from_text (body_part, "", priv->content_type);
+	txt = modest_text_utils_cite ("", priv->content_type, priv->signature,
+				      NULL, tny_header_get_date_sent (header));
+	construct_from_text (body_part, txt, priv->content_type);
+	g_free (txt);
 	g_object_unref (body_part);
 
 	if (msg) {
@@ -216,6 +245,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
@@ -323,7 +353,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;
@@ -338,12 +368,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);