X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-msg.c;h=d88bcf30343b828b1cec33bde1e00d511b47fa70;hp=fac56d578fca0c91125552e7ea8af0a169c17bf2;hb=7441d1df9d7eb43ff93e411e7b4b9e7d72d9d066;hpb=f7633249cd82c0808fa5a563b48b900e49988db7

diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c
index fac56d5..d88bcf3 100644
--- a/src/modest-tny-msg.c
+++ b/src/modest-tny-msg.c
@@ -33,6 +33,7 @@
 #include <tny-simple-list.h>
 #include <tny-folder.h>
 #include <modest-runtime.h>
+#include "modest-formatter.h"
 #include <tny-camel-stream.h>
 #include <camel/camel-stream-mem.h>
 
@@ -44,7 +45,8 @@
 #include "modest-text-utils.h"
 
 static TnyMimePart * add_body_part (TnyMsg *msg, const gchar *body,
-				    const gchar *content_type, gboolean has_attachments);
+				    const gchar *content_type);
+static TnyMimePart * add_html_body_part (TnyMsg *msg, const gchar *body);
 static void add_attachments (TnyMsg *msg, GList *attachments_list);
 static char * get_content_type(const gchar *s);
 static gboolean is_ascii(const gchar *s);
@@ -54,27 +56,76 @@ modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc,
 		    const gchar *bcc, const gchar* subject, const gchar *body,
 		    GSList *attachments)
 {
-	TnyPlatformFactory *fact;
 	TnyMsg *new_msg;
 	TnyHeader *header;
 	gchar *content_type;
 	
 	/* Create new msg */
-	fact    = modest_runtime_get_platform_factory ();
-	new_msg = tny_platform_factory_new_msg (fact);
+	new_msg = modest_formatter_create_message (NULL, TRUE, (attachments != NULL));
 	header  = tny_msg_get_header (new_msg);
 	
-	tny_header_set_from (TNY_HEADER (header), from);
-	tny_header_set_replyto (TNY_HEADER (header), from);
-	tny_header_set_to (TNY_HEADER (header), mailto);
-	tny_header_set_cc (TNY_HEADER (header), cc);
-	tny_header_set_bcc (TNY_HEADER (header), bcc);
-	tny_header_set_subject (TNY_HEADER (header), subject);
+	if ((from != NULL) && (strlen(from) > 0)) {
+		tny_header_set_from (TNY_HEADER (header), from);
+		tny_header_set_replyto (TNY_HEADER (header), from);
+	}
+	if ((mailto != NULL) && (strlen(mailto) > 0)) 
+		tny_header_set_to (TNY_HEADER (header), mailto);
+	if ((cc != NULL) && (strlen(cc) > 0)) 
+		tny_header_set_cc (TNY_HEADER (header), cc);
+	if ((bcc != NULL) && (strlen(bcc) > 0)) 
+		tny_header_set_bcc (TNY_HEADER (header), bcc);
+	
+	if ((subject != NULL) && (strlen(subject) > 0)) 
+		tny_header_set_subject (TNY_HEADER (header), subject);
 
 	content_type = get_content_type(body);
 		
+	/* Add the body of the new mail */
+	/* This is needed even if body is NULL or empty. */
+	add_body_part (new_msg, body, content_type);
+	g_free (content_type);
+		       
+	/* Add attachments */
+	if (attachments)
+		add_attachments (new_msg, (GList*) attachments);
+
+	return new_msg;
+}
+
+TnyMsg*
+modest_tny_msg_new_html_plain (const gchar* mailto, const gchar* from, const gchar *cc,
+			       const gchar *bcc, const gchar* subject, 
+			       const gchar *html_body, const gchar *plain_body,
+			       GSList *attachments)
+{
+	TnyMsg *new_msg;
+	TnyHeader *header;
+	gchar *content_type;
+	
+	/* Create new msg */
+	new_msg = modest_formatter_create_message (NULL, FALSE, (attachments != NULL));
+	header  = tny_msg_get_header (new_msg);
+	
+	if ((from != NULL) && (strlen(from) > 0)) {
+		tny_header_set_from (TNY_HEADER (header), from);
+		tny_header_set_replyto (TNY_HEADER (header), from);
+	}
+	if ((mailto != NULL) && (strlen(mailto) > 0)) 
+		tny_header_set_to (TNY_HEADER (header), mailto);
+	if ((cc != NULL) && (strlen(cc) > 0)) 
+		tny_header_set_cc (TNY_HEADER (header), cc);
+	if ((bcc != NULL) && (strlen(bcc) > 0)) 
+		tny_header_set_bcc (TNY_HEADER (header), bcc);
+	
+	if ((subject != NULL) && (strlen(subject) > 0)) 
+		tny_header_set_subject (TNY_HEADER (header), subject);
+
+	content_type = get_content_type(plain_body);
+		
 	/* Add the body of the new mail */	
-	add_body_part (new_msg, body, content_type, (attachments ? TRUE: FALSE));
+	add_body_part (new_msg, plain_body, content_type);
+	add_html_body_part (new_msg, html_body);
+	g_free (content_type);
 		       
 	/* Add attachments */
 	add_attachments (new_msg, (GList*) attachments);
@@ -87,8 +138,7 @@ modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc,
 static TnyMimePart *
 add_body_part (TnyMsg *msg, 
 	       const gchar *body,
-	       const gchar *content_type,
-	       gboolean has_attachments)
+	       const gchar *content_type)
 {
 	TnyMimePart *text_body_part = NULL;
 	TnyStream *text_body_stream;
@@ -96,14 +146,9 @@ add_body_part (TnyMsg *msg,
 	/* Create the stream */
 	text_body_stream = TNY_STREAM (tny_camel_stream_new
 				       (camel_stream_mem_new_with_buffer
-					(body, strlen(body))));
+					(body, (body ? strlen(body) : 0))));
 
-	/* Create body part if needed */
-	if (has_attachments)
-		text_body_part = tny_platform_factory_new_mime_part
-			(modest_runtime_get_platform_factory ());
-	else
-		text_body_part = TNY_MIME_PART(msg);
+	text_body_part = modest_formatter_create_body_part (NULL, msg);
 
 	/* Construct MIME part */
 	tny_stream_reset (text_body_stream);
@@ -112,11 +157,7 @@ add_body_part (TnyMsg *msg,
 					     content_type);
 	tny_stream_reset (text_body_stream);
 
-	/* Add part if needed */
-	if (has_attachments) {
-		tny_mime_part_add_part (TNY_MIME_PART (msg), text_body_part);
-		g_object_unref (G_OBJECT(text_body_part));
-	}
+	g_object_unref (G_OBJECT(text_body_part));
 
 	/* Clean */
 	g_object_unref (text_body_stream);
@@ -124,6 +165,36 @@ add_body_part (TnyMsg *msg,
 	return text_body_part;
 }
 
+static TnyMimePart *
+add_html_body_part (TnyMsg *msg, 
+		    const gchar *body)
+{
+	TnyMimePart *html_body_part = NULL;
+	TnyStream *html_body_stream;
+
+	/* Create the stream */
+	html_body_stream = TNY_STREAM (tny_camel_stream_new
+				       (camel_stream_mem_new_with_buffer
+					(body, strlen(body))));
+
+	/* Create body part if needed */
+	html_body_part = modest_formatter_create_body_part (NULL, msg);
+
+	/* Construct MIME part */
+	tny_stream_reset (html_body_stream);
+	tny_mime_part_construct_from_stream (html_body_part,
+					     html_body_stream,
+					     "text/html; charset=utf-8");
+	tny_stream_reset (html_body_stream);
+
+	g_object_unref (G_OBJECT(html_body_part));
+
+	/* Clean */
+	g_object_unref (html_body_stream);
+
+	return html_body_part;
+}
+
 static void
 add_attachments (TnyMsg *msg, GList *attachments_list)
 {
@@ -131,6 +202,7 @@ add_attachments (TnyMsg *msg, GList *attachments_list)
 	TnyMimePart *attachment_part, *old_attachment;
 	const gchar *attachment_content_type;
 	const gchar *attachment_filename;
+	const gchar *attachment_cid;
 	TnyStream *attachment_stream;
 
 	for (pos = (GList *)attachments_list; pos; pos = pos->next) {
@@ -138,19 +210,26 @@ add_attachments (TnyMsg *msg, GList *attachments_list)
 		old_attachment = pos->data;
 		attachment_filename = tny_mime_part_get_filename (old_attachment);
 		attachment_stream = tny_mime_part_get_stream (old_attachment);
-		attachment_part = tny_platform_factory_new_mime_part (
-			modest_runtime_get_platform_factory());
-		
+		if (TNY_IS_MSG (old_attachment)) {
+			attachment_part = TNY_MIME_PART (tny_platform_factory_new_msg (modest_runtime_get_platform_factory ()));
+		} else {
+			attachment_part = tny_platform_factory_new_mime_part (
+				modest_runtime_get_platform_factory());
+		}
 		attachment_content_type = tny_mime_part_get_content_type (old_attachment);
-				 
+		attachment_cid = tny_mime_part_get_content_id (old_attachment);
+
+		tny_stream_reset (attachment_stream);
 		tny_mime_part_construct_from_stream (attachment_part,
 						     attachment_stream,
 						     attachment_content_type);
 		tny_stream_reset (attachment_stream);
 		
 		tny_mime_part_set_filename (attachment_part, attachment_filename);
+		tny_mime_part_set_content_id (attachment_part, attachment_cid);
 		
 		tny_mime_part_add_part (TNY_MIME_PART (msg), attachment_part);
+		g_object_unref (attachment_stream);
 /* 		g_object_unref (attachment_part); */
 	}
 }
@@ -174,13 +253,18 @@ modest_tny_msg_get_body (TnyMsg *msg, gboolean want_html)
 	tny_stream_reset (stream);
 	tny_mime_part_decode_to_stream (body, stream);
 	tny_stream_reset (stream);
-
-	g_object_unref (G_OBJECT(stream));
-	g_object_unref (G_OBJECT(body));
 	
 	gtk_text_buffer_get_bounds (buf, &start, &end);
 	to_quote = gtk_text_buffer_get_text (buf, &start, &end, FALSE);
+	if (tny_mime_part_content_type_is (body, "text/plain")) {
+		gchar *to_quote_converted = modest_text_utils_convert_to_html (to_quote);
+		g_free (to_quote);
+		to_quote = to_quote_converted;
+	}
+
 	g_object_unref (buf);
+	g_object_unref (G_OBJECT(stream));
+	g_object_unref (G_OBJECT(body));
 
 	return to_quote;
 }
@@ -261,6 +345,192 @@ modest_tny_msg_find_body_part (TnyMsg *msg, gboolean want_html)
 }
 
 
+static TnyMsg *
+create_reply_forward_mail (TnyMsg *msg, const gchar *from, const gchar *signature, 
+			   gboolean is_reply, guint type, GList *attachments)
+{
+	TnyMsg *new_msg;
+	TnyHeader *new_header, *header;
+	gchar *new_subject;
+	TnyMimePart *body;
+	ModestFormatter *formatter;
+	gchar *subject_prefix;
+
+	/* Get body from original msg. Always look for the text/plain
+	   part of the message to create the reply/forwarded mail */
+	header = tny_msg_get_header (msg);
+	body   = modest_tny_msg_find_body_part (msg, FALSE);
+
+	/* TODO: select the formatter from account prefs */
+	if (modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_PREFER_FORMATTED_TEXT, NULL))
+		formatter = modest_formatter_new ("text/html", signature);
+	else
+		formatter = modest_formatter_new ("text/plain", signature);
+
+	/* Format message body */
+	if (is_reply) {
+		switch (type) {
+		case MODEST_TNY_MSG_REPLY_TYPE_CITE:
+		default:
+			new_msg = modest_formatter_cite  (formatter, body, header);
+			break;
+		case MODEST_TNY_MSG_REPLY_TYPE_QUOTE:
+			new_msg = modest_formatter_quote (formatter, body, header, attachments);
+			break;
+		}
+	} else {
+		switch (type) {
+		case MODEST_TNY_MSG_FORWARD_TYPE_INLINE:
+		default:
+			new_msg = modest_formatter_inline  (formatter, body, header, attachments);
+			break;
+		case MODEST_TNY_MSG_FORWARD_TYPE_ATTACHMENT:
+			new_msg = modest_formatter_attach (formatter, body, header);
+			break;
+		}
+	}
+	g_object_unref (G_OBJECT(formatter));
+	g_object_unref (G_OBJECT(body));
+	
+	/* Fill the header */
+	new_header = tny_msg_get_header (new_msg);	
+	tny_header_set_from (new_header, from);
+	tny_header_set_replyto (new_header, from);
+
+	/* Change the subject */
+	if (is_reply)
+		subject_prefix = g_strconcat (_("mail_va_re"), ":", NULL);
+	else
+		subject_prefix = g_strconcat (_("mail_va_fw"), ":", NULL);
+	new_subject =
+		(gchar *) modest_text_utils_derived_subject (tny_header_get_subject(header),
+							     subject_prefix);
+	g_free (subject_prefix);
+	tny_header_set_subject (new_header, (const gchar *) new_subject);
+	g_free (new_subject);
+
+	/* Clean */
+	g_object_unref (G_OBJECT (new_header));
+	g_object_unref (G_OBJECT (header));
+
+	return new_msg;
+}
+
+static void
+add_if_attachment (gpointer data, gpointer user_data)
+{
+	TnyMimePart *part;
+	GList **attachments_list;
+
+	part = TNY_MIME_PART (data);
+	attachments_list = ((GList **) user_data);
+
+	if ((tny_mime_part_is_attachment (part))||(TNY_IS_MSG (part)))
+		*attachments_list = g_list_prepend (*attachments_list, part);
+}
+
+TnyMsg* 
+modest_tny_msg_create_forward_msg (TnyMsg *msg, 
+				   const gchar *from,
+				   const gchar *signature,
+				   ModestTnyMsgForwardType forward_type)
+{
+	TnyMsg *new_msg;
+	TnyList *parts = NULL;
+	GList *attachments_list = NULL;
+
+	/* Add attachments */
+	parts = TNY_LIST (tny_simple_list_new());
+	tny_mime_part_get_parts (TNY_MIME_PART (msg), parts);
+	tny_list_foreach (parts, add_if_attachment, &attachments_list);
+
+	new_msg = create_reply_forward_mail (msg, from, signature, FALSE, forward_type, attachments_list);
+	add_attachments (new_msg, attachments_list);
+
+	/* Clean */
+	if (attachments_list)
+		g_list_free (attachments_list);
+	g_object_unref (G_OBJECT (parts));
+
+	return new_msg;
+}
+
+TnyMsg* 
+modest_tny_msg_create_reply_msg (TnyMsg *msg, 
+				 const gchar *from,
+				 const gchar *signature,
+				 ModestTnyMsgReplyType reply_type,
+				 ModestTnyMsgReplyMode reply_mode)
+{
+	TnyMsg *new_msg = NULL;
+	TnyHeader *new_header, *header;
+	const gchar* reply_to;
+	gchar *new_cc = NULL;
+	const gchar *cc = NULL, *bcc = NULL;
+	GString *tmp = NULL;
+	TnyList *parts = NULL;
+	GList *attachments_list = NULL;
+
+	/* Add attachments */
+	parts = TNY_LIST (tny_simple_list_new());
+	tny_mime_part_get_parts (TNY_MIME_PART (msg), parts);
+	tny_list_foreach (parts, add_if_attachment, &attachments_list);
+
+	new_msg = create_reply_forward_mail (msg, from, signature, TRUE, reply_type, attachments_list);
+	if (attachments_list) {
+		g_list_foreach (attachments_list, (GFunc) g_object_unref, NULL);
+		g_list_free (attachments_list);
+	}
+	g_object_unref (G_OBJECT (parts));
+
+	/* Fill the header */
+	header = tny_msg_get_header (msg);
+	new_header = tny_msg_get_header (new_msg);
+	reply_to = tny_header_get_replyto (header);
+
+	if (reply_to)
+		tny_header_set_to (new_header, reply_to);
+	else
+		tny_header_set_to (new_header, tny_header_get_from (header));
+
+	switch (reply_mode) {
+	case MODEST_TNY_MSG_REPLY_MODE_SENDER:
+		/* Do not fill neither cc nor bcc */
+		break;
+	case MODEST_TNY_MSG_REPLY_MODE_LIST:
+		/* TODO */
+		break;
+	case MODEST_TNY_MSG_REPLY_MODE_ALL:
+		/* Concatenate to, cc and bcc */
+		cc = tny_header_get_cc (header);
+		bcc = tny_header_get_bcc (header);
+
+		tmp = g_string_new (tny_header_get_to (header));
+		if (cc)  g_string_append_printf (tmp, ",%s",cc);
+		if (bcc) g_string_append_printf (tmp, ",%s",bcc);
+
+               /* Remove my own address from the cc list. TODO:
+                  remove also the To: of the new message, needed due
+                  to the new reply_to feature */
+		new_cc = (gchar *)
+			modest_text_utils_remove_address ((const gchar *) tmp->str,
+							  from);
+		/* FIXME: remove also the mails from the new To: */
+		tny_header_set_cc (new_header, new_cc);
+
+		/* Clean */
+		g_string_free (tmp, TRUE);
+		g_free (new_cc);
+		break;
+	}
+
+	/* Clean */
+	g_object_unref (G_OBJECT (new_header));
+	g_object_unref (G_OBJECT (header));
+
+	return new_msg;
+}
+
 
 static gboolean
 is_ascii(const gchar *s)