X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-msg.c;h=78b4b75ccd64006b95578ff443cfa51947c9b1ec;hp=a0d072c6111ec71763d3501c170edaa8e70358fe;hb=4d39841513a3a7f7aa9d38ab97cb9fcc9171e80b;hpb=b16d392feb0a34a198d4c40da65b9363fb5e01b6

diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c
index a0d072c..78b4b75 100644
--- a/src/modest-tny-msg.c
+++ b/src/modest-tny-msg.c
@@ -61,7 +61,7 @@ static gboolean is_ascii(const gchar *s);
 
 TnyMsg*
 modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc,
-		    const gchar *bcc, const gchar* subject, 
+		    const gchar *bcc, const gchar* subject,
 		    const gchar *references, const gchar *in_reply_to,
 		    const gchar *body,
 		    GList *attachments, gint *attached, GError **err)
@@ -70,11 +70,11 @@ modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc,
 	TnyHeader *header;
 	gchar *content_type;
 	gint tmp_attached = 0;
-	
+
 	/* Create new msg */
 	new_msg = modest_formatter_create_message (NULL, TRUE, (attachments != NULL), FALSE);
 	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);
@@ -84,12 +84,12 @@ modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc,
 		tny_header_set_to (TNY_HEADER (header), removed_to);
 		g_free (removed_to);
 	}
-	if ((cc != NULL) && (strlen(cc) > 0)) 
+	if ((cc != NULL) && (strlen(cc) > 0))
 		tny_header_set_cc (TNY_HEADER (header), cc);
-	if ((bcc != NULL) && (strlen(bcc) > 0)) 
+	if ((bcc != NULL) && (strlen(bcc) > 0))
 		tny_header_set_bcc (TNY_HEADER (header), bcc);
-	
-	if ((subject != NULL) && (strlen(subject) > 0)) 
+
+	if ((subject != NULL) && (strlen(subject) > 0))
 		tny_header_set_subject (TNY_HEADER (header), subject);
 
 	content_type = get_content_type(body);
@@ -106,12 +106,12 @@ modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc,
 
 	if (in_reply_to)
 		tny_mime_part_set_header_pair (TNY_MIME_PART (new_msg), "In-Reply-To", in_reply_to);
-	
+
 	/* 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)
 		tmp_attached = add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE, err);
@@ -350,7 +350,9 @@ add_attachments (TnyMimePart *part, GList *attachments_list, gboolean add_inline
 						tny_mime_part_set_header_pair (attachment_part, "Content-Disposition",
 									       "attachment");
 				}
-				tny_mime_part_set_transfer_encoding (TNY_MIME_PART (attachment_part), "base64");
+				if (!TNY_IS_MSG (old_attachment))  {
+					tny_mime_part_set_transfer_encoding (TNY_MIME_PART (attachment_part), "base64");
+				}
 				ret = tny_mime_part_add_part (TNY_MIME_PART (part), attachment_part);
 				attached++;
 				if (old_cid)
@@ -442,10 +444,55 @@ modest_tny_msg_get_body (TnyMsg *msg, gboolean want_html, gboolean *is_html)
 }
 
 
+static TnyMimePart*
+modest_tny_msg_find_body_part_in_alternative (TnyMimePart *msg, gboolean want_html)
+{
+	TnyList *parts;
+	TnyIterator *iter;
+	TnyMimePart *part = NULL;
+	TnyMimePart *first_part = NULL;
+	const gchar *desired_mime_type = want_html ? "text/html" : "text/plain";
+
+	parts = TNY_LIST (tny_simple_list_new());
+	tny_mime_part_get_parts (TNY_MIME_PART (msg), parts);
+
+	for (iter  = tny_list_create_iterator(parts); 
+	     !tny_iterator_is_done (iter);
+	     tny_iterator_next (iter)) {
+		gchar *content_type;
+		gboolean is_body;
+
+		part = TNY_MIME_PART (tny_iterator_get_current (iter));
+
+		if (first_part == NULL) {
+			g_object_ref (part);
+			first_part = part;
+		}
+
+		is_body = FALSE;
+		content_type = g_ascii_strdown (tny_mime_part_get_content_type (part), -1);
+		is_body = g_str_has_prefix (content_type, desired_mime_type);
+		if (is_body)
+			break;
+
+		g_object_unref (part);
+		part = NULL;
+
+	}
+	g_object_unref (iter);
+	g_object_unref (parts);
+
+	if (part == NULL) {
+		return first_part;
+	} else {
+		if (first_part) g_object_unref (first_part);
+		return part;
+	}
+}
+
 TnyMimePart*
 modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_html)
 {
-	const gchar *desired_mime_type = want_html ? "text/html" : "text/plain";
 	TnyMimePart *part = NULL;
 	TnyList *parts = NULL;
 	TnyIterator *iter = NULL;
@@ -470,6 +517,12 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht
 		g_free (header_content_type);
 		return NULL;
 	}	
+	if (header_content_type_lower && 
+	    g_str_has_prefix (header_content_type_lower, "multipart/alternative")) {
+		g_free (header_content_type_lower);
+		g_free (header_content_type);
+		return modest_tny_msg_find_body_part_in_alternative (msg, want_html);
+	}	
 	g_free (header_content_type_lower);
 	g_free (header_content_type);
 
@@ -533,13 +586,23 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht
 				g_free (content_disp);
 			}
 			
-			if (g_str_has_prefix (content_type, desired_mime_type) && 
+			if (g_str_has_prefix (content_type, "text/") && 
 			    !has_content_disp_name &&
 			    !modest_tny_mime_part_is_attachment_for_modest (part)) {
-				/* we found the desired mime-type! */
+				/* we found the body. Doesn't have to be the desired mime part, first
+				   text/ part in a mixed is the body */
 				g_free (content_type);
 				break;
 
+			} else if (g_str_has_prefix(content_type, "multipart/alternative")) {
+
+				/* multipart? recurse! */
+				g_object_unref (part);
+				g_free (content_type);
+				part = modest_tny_msg_find_body_part_in_alternative (part, want_html);
+				if (part)
+					break;
+
 			} else 	if (g_str_has_prefix(content_type, "multipart")) {
 
 				/* multipart? recurse! */
@@ -564,14 +627,8 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht
 	g_object_unref (G_OBJECT(iter));
 	g_object_unref (G_OBJECT(parts));
 
-	/* if were trying to find an HTML part and couldn't find it,
-	 * try to find a text/plain part instead
-	 */
-	if (!part && want_html) 
-		return modest_tny_msg_find_body_part_from_mime_part (msg, FALSE);
-	else
-		return part; /* this maybe NULL, this is not an error; some message just don't have a body
-			      * part */
+	return part; /* this maybe NULL, this is not an error; some message just don't have a body
+		      * part */
 }
 
 
@@ -597,10 +654,12 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from,
 	gchar *old_subject;
 	gchar *new_subject;
 	TnyMimePart *body = NULL;
+	TnyMimePart *html_body = NULL;
 	ModestFormatter *formatter;
 	gchar *subject_prefix;
 	gboolean no_text_part;
 	gchar *parent_uid;
+	gboolean forward_as_attach = FALSE;
 
 	if (header)
 		g_object_ref (header);
@@ -609,8 +668,10 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from,
 
 	/* Get body from original msg. Always look for the text/plain
 	   part of the message to create the reply/forwarded mail */
-	if (msg != NULL)
+	if (msg != NULL) {
 		body   = modest_tny_msg_find_body_part (msg, FALSE);
+		html_body = modest_tny_msg_find_body_part (msg, TRUE);
+	}
 
 	if (modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_PREFER_FORMATTED_TEXT,
 				  NULL))
@@ -624,14 +685,14 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from,
 
 	/* when we're reply, include the text part if we have it, or nothing otherwise. */
 	if (is_reply)
-		new_msg = modest_formatter_quote  (formatter, no_text_part ? NULL: body, header,
+		new_msg = modest_formatter_quote  (formatter, body, header,
 						    attachments);
 	else {
-		/* for attachements; inline if there is a text part, and include the
-		 * full old mail if there was none */
-		if (no_text_part) {
+		if (no_text_part || (html_body && (strcmp (tny_mime_part_get_content_type (html_body), "text/html")==0))) {
+			forward_as_attach = TRUE;
 			new_msg = modest_formatter_attach (formatter, msg, header);
-		} else { 
+		} else {
+			forward_as_attach = FALSE;
 			new_msg = modest_formatter_inline  (formatter, body, header,
 							    attachments);
 		}
@@ -640,6 +701,8 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from,
 	g_object_unref (G_OBJECT(formatter));
 	if (body)
 		g_object_unref (G_OBJECT(body));
+	if (html_body)
+		g_object_unref (G_OBJECT(html_body));
 
 	/* Fill the header */
 	new_header = tny_msg_get_header (new_msg);
@@ -677,7 +740,7 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from,
 	g_object_unref (G_OBJECT (header));
 	/* ugly to unref it here instead of in the calling func */
 
-	if (!is_reply & !no_text_part) {
+	if (!is_reply & !forward_as_attach) {
 		add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE, NULL);
 	}
 
@@ -887,7 +950,7 @@ get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from,
 	old_from     = tny_header_dup_from (header);
 	
 	if (!old_from && !old_reply_to) {
-		g_warning ("%s: failed to get either Reply-To: or From: from header",
+		g_debug ("%s: failed to get either Reply-To: or From: from header",
 			   __FUNCTION__);
 		return NULL;
 	}
@@ -908,7 +971,7 @@ get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from,
 	if (reply_mode == MODEST_TNY_MSG_REPLY_MODE_ALL) {
 		gchar *old_to = tny_header_dup_to (header);
 		if (!old_to) 
-			g_warning ("%s: no To: address found in source mail",
+			g_debug ("%s: no To: address found in source mail",
 				   __FUNCTION__);
 		else {
 			/* append the old To: */
@@ -1105,7 +1168,7 @@ modest_tny_msg_create_reply_msg (TnyMsg *msg,
 	new_header = tny_msg_get_header(new_msg);
 	new_to = get_new_to (msg, header, from, reply_mode);
 	if (!new_to)
-		g_warning ("%s: failed to get new To:", __FUNCTION__);
+		g_debug ("%s: failed to get new To:", __FUNCTION__);
 	else {
 		tny_header_set_to (new_header, new_to);
 		g_free (new_to);
@@ -1152,7 +1215,7 @@ get_content_type(const gchar *s)
 			g_string_append(type, "; charset=\"utf-8\"");
 		} else {
 			/* it should be impossible to reach this, but better safe than sorry */
-			g_warning("invalid utf8 in message");
+			g_debug("invalid utf8 in message");
 			g_string_append(type, "; charset=\"latin1\"");
 		}
 	}
@@ -1191,29 +1254,55 @@ modest_tny_msg_header_get_all_recipients_list (TnyHeader *header)
 {
 	GSList *recipients = NULL;
 	gchar *from = NULL, *to = NULL, *cc = NULL, *bcc = NULL;
+	gchar *after_remove;
+	GString *buffer;
+	gboolean add_separator = TRUE;
 
 	if (header == NULL)
 		return NULL;
 
+	buffer = g_string_new ("");
+
 	from = tny_header_dup_from (header);
 	to = tny_header_dup_to (header);
 	cc = tny_header_dup_cc (header);
 	bcc = tny_header_dup_bcc (header);
 
 	recipients = NULL;
-	if (from)
-		recipients = g_slist_concat (recipients, modest_text_utils_split_addresses_list (from));
-	if (to)
-		recipients = g_slist_concat (recipients, modest_text_utils_split_addresses_list (to));
-	if (cc)
-		recipients = g_slist_concat (recipients, modest_text_utils_split_addresses_list (cc));
-	if (bcc)
-		recipients = g_slist_concat (recipients, modest_text_utils_split_addresses_list (bcc));
-
-	g_free (from);
-	g_free (to);
-	g_free (cc);
-	g_free (bcc);
+	if (from) {
+		buffer = g_string_append (buffer, from);
+		add_separator = TRUE;
+	}
+	if (to) {
+		if (add_separator)
+			buffer = g_string_append (buffer, "; ");
+		else
+			add_separator = TRUE;
+
+		buffer = g_string_append (buffer, to);
+	}
+	if (cc) {
+		if (add_separator)
+			buffer = g_string_append (buffer, "; ");
+		else
+			add_separator = TRUE;
+
+		buffer = g_string_append (buffer, cc);
+	}
+	if (bcc) {
+		if (add_separator)
+			buffer = g_string_append (buffer, "; ");
+		else
+			add_separator = TRUE;
+
+		buffer = g_string_append (buffer, bcc);
+	}
+
+	after_remove = modest_text_utils_remove_duplicate_addresses (buffer->str);
+	g_string_free (buffer, TRUE);
+
+	recipients = modest_text_utils_split_addresses_list (after_remove);
+	g_free (after_remove);
 
 	return recipients;
 }