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

diff --git a/src/modest-formatter.c b/src/modest-formatter.c
index ed10222..f2ecfd9 100644
--- a/src/modest-formatter.c
+++ b/src/modest-formatter.c
@@ -32,8 +32,7 @@
 #include <tny-header.h>
 #include <tny-simple-list.h>
 #include <tny-gtk-text-buffer-stream.h>
-#include <tny-camel-stream.h>
-#include <camel/camel-stream-mem.h>
+#include <tny-camel-mem-stream.h>
 #include "modest-formatter.h"
 #include "modest-text-utils.h"
 #include "modest-tny-platform-factory.h"
@@ -108,9 +107,8 @@ construct_from_text (TnyMimePart *part,
 	TnyStream *text_body_stream;
 
 	/* Create the stream */
-	text_body_stream = TNY_STREAM (tny_camel_stream_new
-				       (camel_stream_mem_new_with_buffer
-					(text, strlen(text))));
+	text_body_stream = TNY_STREAM (tny_camel_mem_stream_new_with_buffer
+					(text, strlen(text)));
 
 	/* Construct MIME part */
 	tny_stream_reset (text_body_stream);
@@ -179,6 +177,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);
@@ -186,7 +185,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) {
@@ -280,28 +282,40 @@ static gchar *
 modest_formatter_wrapper_cite (ModestFormatter *self, const gchar *text, TnyHeader *header,
 			       GList *attachments) 
 {
+	gchar *result, *from;
 	ModestFormatterPrivate *priv = MODEST_FORMATTER_GET_PRIVATE (self);
 	
-	return modest_text_utils_cite (text, 
-				       priv->content_type, 
-				       priv->signature,
-				       tny_header_get_from (header), 
-				       tny_header_get_date_sent (header));
+	from = tny_header_dup_from (header);
+	result = modest_text_utils_cite (text, 
+					 priv->content_type, 
+					 priv->signature,
+					 from, 
+					 tny_header_get_date_sent (header));
+	g_free (from);
+	return result;
 }
 
 static gchar *
 modest_formatter_wrapper_inline (ModestFormatter *self, const gchar *text, TnyHeader *header,
 				 GList *attachments) 
 {
+	gchar *result, *from, *to, *subject;
 	ModestFormatterPrivate *priv = MODEST_FORMATTER_GET_PRIVATE (self);
 
-	return modest_text_utils_inline (text, 
-					 priv->content_type, 
-					 priv->signature,
-					 tny_header_get_from (header), 
-					 tny_header_get_date_sent (header),
-					 tny_header_get_to (header),
-					 tny_header_get_subject (header));
+	from = tny_header_dup_from (header);
+	to = tny_header_dup_to (header);
+	subject = tny_header_dup_subject (header);
+	result =  modest_text_utils_inline (text, 
+					    priv->content_type, 
+					    priv->signature,
+					    from,
+					    tny_header_get_date_sent (header),
+					    to,
+					    subject);
+	g_free (subject);
+	g_free (to);
+	g_free (from);
+	return result;
 }
 
 static gchar *
@@ -312,6 +326,7 @@ modest_formatter_wrapper_quote (ModestFormatter *self, const gchar *text, TnyHea
 	GList *filenames = NULL;
 	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)) {
@@ -319,7 +334,7 @@ modest_formatter_wrapper_quote (ModestFormatter *self, const gchar *text, TnyHea
 		gchar *filename = NULL;
 		if (TNY_IS_MSG (part)) {
 			TnyHeader *header = tny_msg_get_header (TNY_MSG (part));
-			filename = g_strdup (tny_header_get_subject (header));
+			filename = tny_header_dup_subject (header);
 			if ((filename == NULL)||(filename[0] == '\0')) {
 				g_free (filename);
 				filename = g_strdup (_("mail_va_no_subject"));
@@ -335,13 +350,15 @@ modest_formatter_wrapper_quote (ModestFormatter *self, const gchar *text, TnyHea
 	filenames = g_list_reverse (filenames);
 
 	/* TODO: get 80 from the configuration */
+	from = tny_header_dup_from (header);
 	result = modest_text_utils_quote (text, 
 					  priv->content_type, 
 					  priv->signature,
-					  tny_header_get_from (header), 
+					  from,
 					  tny_header_get_date_sent (header),
 					  filenames,
 					  80);
+	g_free (from);
 
 	g_list_foreach (filenames, (GFunc) g_free, NULL);
 	g_list_free (filenames);