X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-msg.c;h=f27c5eac2559b0983fedcc9ed16ec6f9e3b62fd0;hb=3bdc64c81733aabfe8af0b1b1e4119623d078f03;hp=f9e4e7f067afcb0e2b6efff362f5b432111c1a17;hpb=2750352537c6500de51af0d12fef36b0b3655501;p=modest

diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c
index f9e4e7f..f27c5ea 100644
--- a/src/modest-tny-msg.c
+++ b/src/modest-tny-msg.c
@@ -442,10 +442,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 +515,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 +584,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 +625,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 */
 }
 
 
@@ -692,6 +747,101 @@ modest_tny_msg_get_parent_uid (TnyMsg *msg)
 	return g_object_get_data (G_OBJECT(msg), MODEST_TNY_MSG_PARENT_UID);
 }
 
+static gchar *get_signed_protocol (TnyMimePart *part)
+{
+	TnyList *header_pairs;
+	TnyIterator *iterator;
+	gchar *result = NULL;
+
+	header_pairs = TNY_LIST (tny_simple_list_new ());
+	tny_mime_part_get_header_pairs (part, header_pairs);
+	iterator = tny_list_create_iterator (header_pairs);
+
+	while (!result && !tny_iterator_is_done (iterator)) {
+		TnyPair *pair;
+		const gchar *name;
+
+		pair = TNY_PAIR (tny_iterator_get_current (iterator));
+		name = tny_pair_get_name (pair);
+		if (name && !g_ascii_strcasecmp (name, "Content-Type")) {
+			const gchar *s;
+			s = tny_pair_get_value (pair);
+			if (s) {
+				s = strstr (s, "protocol=");
+				if (s) {
+					const gchar *t;
+					s += 9;
+					if (*s == '\"') {
+						s++;
+						t = strstr (s, "\"");
+					} else {
+						t = strstr (s, ";");
+					}
+					result = g_strndup (s, t - s);
+				}
+			}
+		}
+
+		g_object_unref (pair);
+		tny_iterator_next (iterator);
+	}
+
+	g_object_unref (iterator);
+	g_object_unref (header_pairs);
+
+	return result;
+}
+
+TnyMimePart *
+modest_tny_msg_get_attachments_parent (TnyMsg *msg)
+{
+	TnyMimePart *result;
+	const gchar *content_type;
+
+	result = NULL;
+
+	content_type = tny_mime_part_get_content_type (TNY_MIME_PART (msg));
+	if (content_type && !strcmp (content_type, "multipart/signed")) {
+		TnyList *msg_children;
+		TnyIterator *iterator;
+		gchar *signed_protocol;
+
+		msg_children = TNY_LIST (tny_simple_list_new ());
+		tny_mime_part_get_parts (TNY_MIME_PART (msg), msg_children);
+
+		iterator = tny_list_create_iterator (msg_children);
+		signed_protocol = get_signed_protocol (TNY_MIME_PART (msg));
+			
+		while (!result && !tny_iterator_is_done (iterator)) {
+			TnyMimePart *part;
+
+			part = TNY_MIME_PART (tny_iterator_get_current (iterator));
+			if (signed_protocol) {
+				const gchar *part_content_type;
+
+				part_content_type = tny_mime_part_get_content_type (part);
+				if (part_content_type && g_ascii_strcasecmp (part_content_type, signed_protocol)) {
+					result = g_object_ref (part);
+				}
+			} else {
+				result = g_object_ref (part);
+			}
+
+			g_object_unref (part);
+			tny_iterator_next (iterator);
+		}
+
+		g_object_unref (iterator);
+		g_free (signed_protocol);
+		g_object_unref (msg_children);
+	}
+	if (result == NULL) {
+		result = g_object_ref (msg);
+	}
+
+	return result;
+}
+
 
 
 static void
@@ -719,34 +869,10 @@ modest_tny_msg_create_forward_msg (TnyMsg *msg,
 	TnyList *parts = NULL;
 	GList *attachments_list = NULL;
 	TnyMimePart *part_to_check = NULL;
-	const gchar *content_type;
 
 	g_return_val_if_fail (msg && TNY_IS_MSG(msg), NULL);
-	
-	content_type = tny_mime_part_get_content_type (TNY_MIME_PART (msg));
-	if (content_type && !strcmp (content_type, "multipart/signed")) {
-		TnyList *msg_children;
-		guint length;
-
-		msg_children = TNY_LIST (tny_simple_list_new ());
-		tny_mime_part_get_parts (TNY_MIME_PART (msg), msg_children);
 
-		length = tny_list_get_length (msg_children);
-		if (length == 1 || length == 2) {
-			TnyIterator *iterator;
-
-			iterator = tny_list_create_iterator (msg_children);
-
-			part_to_check = TNY_MIME_PART (tny_iterator_get_current (iterator));
-
-			g_object_unref (iterator);
-		}
-
-		g_object_unref (msg_children);
-	}
-	if (part_to_check == NULL) {
-		part_to_check = g_object_ref (msg);
-	}
+	part_to_check = modest_tny_msg_get_attachments_parent (TNY_MSG (msg));
 	
 	/* Add attachments */
 	parts = TNY_LIST (tny_simple_list_new());
@@ -797,6 +923,7 @@ get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from,
 	gchar* old_reply_to;
 	gchar* old_from;
 	gchar* new_to;
+	gchar* tmp;
 	
 	/* according to RFC2369 (http://www.faqs.org/rfcs/rfc2369.html), we
 	 * can identify Mailing-List posts by the List-Help header.
@@ -815,7 +942,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;
 	}
@@ -836,7 +963,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: */
@@ -860,6 +987,10 @@ get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from,
 		}
 	}
 
+	tmp = modest_text_utils_simplify_recipients (new_to);
+	g_free (new_to);
+	new_to = tmp;
+
 	return new_to;
 }
 
@@ -1000,35 +1131,11 @@ modest_tny_msg_create_reply_msg (TnyMsg *msg,
 	TnyList *parts = NULL;
 	GList *attachments_list = NULL;
 	TnyMimePart *part_to_check = NULL;
-	const gchar *content_type;
 
 	g_return_val_if_fail (msg && TNY_IS_MSG(msg), NULL);
 
-	content_type = tny_mime_part_get_content_type (TNY_MIME_PART (msg));
-	if (content_type && !strcmp (content_type, "multipart/signed")) {
-		TnyList *msg_children;
-		guint length;
-
-		msg_children = TNY_LIST (tny_simple_list_new ());
-		tny_mime_part_get_parts (TNY_MIME_PART (msg), msg_children);
-
-		length = tny_list_get_length (msg_children);
-		if (length == 1 || length == 2) {
-			TnyIterator *iterator;
-
-			iterator = tny_list_create_iterator (msg_children);
-
-			part_to_check = TNY_MIME_PART (tny_iterator_get_current (iterator));
+	part_to_check = modest_tny_msg_get_attachments_parent (TNY_MSG (msg));
 
-			g_object_unref (iterator);
-		}
-
-		g_object_unref (msg_children);
-	}
-	if (part_to_check == NULL) {
-		part_to_check = g_object_ref (msg);
-	}
-	
 	parts = TNY_LIST (tny_simple_list_new());
 	tny_mime_part_get_parts (TNY_MIME_PART (part_to_check), parts);
 	tny_list_foreach (parts, add_if_attachment, &attachments_list);
@@ -1053,7 +1160,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);
@@ -1100,7 +1207,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\"");
 		}
 	}
@@ -1139,6 +1246,7 @@ modest_tny_msg_header_get_all_recipients_list (TnyHeader *header)
 {
 	GSList *recipients = NULL;
 	gchar *from = NULL, *to = NULL, *cc = NULL, *bcc = NULL;
+	gchar *tmp = NULL, *old_tmp = NULL;
 
 	if (header == NULL)
 		return NULL;
@@ -1149,19 +1257,33 @@ modest_tny_msg_header_get_all_recipients_list (TnyHeader *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) {
+		tmp = g_strdup (from);
+		old_tmp = tmp;
+		g_free (from);
+	}
+	if (to) {
+		tmp = g_strjoin ("; ", old_tmp, to, NULL);
+		g_free (old_tmp);
+		old_tmp = tmp;
+		g_free (to);
+	}
+	if (cc) {
+		tmp = g_strjoin ("; ", old_tmp, cc, NULL);
+		g_free (old_tmp);
+		old_tmp = tmp;
+		g_free (cc);
+	}
+	if (bcc) {
+		tmp = g_strjoin ("; ", old_tmp, bcc, NULL);
+		g_free (old_tmp);
+		old_tmp = tmp;
+		g_free (bcc);
+	}
+
+	old_tmp = modest_text_utils_remove_duplicate_addresses (tmp);
+	recipients = modest_text_utils_split_addresses_list (old_tmp);
+	g_free (tmp);
 
 	return recipients;
 }