X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-msg.c;h=3d663409a3f659b6d1106e9f3f44cac9a4cd3406;hp=46ff6b7528eec3628c3a23ebb6d4452b1bff7b8d;hb=6a50cff86ae8ac2690442fe74b60334d21de33c6;hpb=8c95463f904bcaa0d7973a1d345045013fd343ad;ds=sidebyside

diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c
index 46ff6b7..3d66340 100644
--- a/src/modest-tny-msg.c
+++ b/src/modest-tny-msg.c
@@ -58,6 +58,8 @@ static void add_images (TnyMsg *msg, GList *attachments_list, GError **err);
 static char * get_content_type(const gchar *s);
 static gboolean is_ascii(const gchar *s);
 
+static TnyMimePart* modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_html);
+static TnyMimePart* modest_tny_msg_find_calendar_from_mime_part  (TnyMimePart *msg);
 
 TnyMsg*
 modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc,
@@ -224,7 +226,7 @@ add_html_body_part (TnyMsg *msg,
 
 	/* Create the stream */
 	html_body_stream = TNY_STREAM (tny_camel_mem_stream_new_with_buffer
-					(body, strlen(body)));
+				       (body, (body) ? strlen(body) : 0));
 
 	/* Create body part if needed */
 	html_body_part = modest_formatter_create_body_part (NULL, msg);
@@ -457,14 +459,14 @@ modest_tny_msg_find_body_part_in_alternative (TnyMimePart *msg, gboolean want_ht
 {
 	TnyList *parts;
 	TnyIterator *iter;
-	TnyMimePart *part = NULL;
+	TnyMimePart *part = NULL, *related = 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); 
+	for (iter  = tny_list_create_iterator(parts);
 	     !tny_iterator_is_done (iter);
 	     tny_iterator_next (iter)) {
 		gchar *content_type;
@@ -483,6 +485,16 @@ modest_tny_msg_find_body_part_in_alternative (TnyMimePart *msg, gboolean want_ht
 		if (is_body)
 			break;
 
+		/* Makes no sense to look for related MIME parts if we
+		   only want the plain text parts */
+		if (want_html && g_str_has_prefix (content_type, "multipart/related")) {
+			/* In an alternative the last part is supposed
+			   to be the richest */
+			if (related)
+				g_object_unref (related);
+			related = g_object_ref (part);
+		}
+
 		g_object_unref (part);
 		part = NULL;
 
@@ -491,14 +503,26 @@ modest_tny_msg_find_body_part_in_alternative (TnyMimePart *msg, gboolean want_ht
 	g_object_unref (parts);
 
 	if (part == NULL) {
-		return first_part;
+		if (related) {
+			TnyMimePart *retval;
+			if (first_part)
+				g_object_unref (first_part);
+			retval = modest_tny_msg_find_body_part_from_mime_part (related, want_html);
+			g_object_unref (related);
+			return retval;
+		} else {
+			return first_part;
+		}
 	} else {
-		if (first_part) g_object_unref (first_part);
+		if (first_part)
+			g_object_unref (first_part);
+		if (related)
+			g_object_unref (related);
 		return part;
 	}
 }
 
-TnyMimePart*
+static TnyMimePart*
 modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_html)
 {
 	TnyMimePart *part = NULL;
@@ -506,7 +530,8 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht
 	TnyIterator *iter = NULL;
 	gchar *header_content_type;
 	gchar *header_content_type_lower = NULL;
-	
+	gboolean is_related = FALSE;
+
 	if (!msg)
 		return NULL;
 
@@ -517,19 +542,167 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht
 		header_content_type = g_strstrip (header_content_type);
 		header_content_type_lower = g_ascii_strdown (header_content_type, -1);
 	}
-	if (header_content_type_lower && 
+	if (header_content_type_lower &&
 	    g_str_has_prefix (header_content_type_lower, "multipart/") &&
 	    !g_str_has_prefix (header_content_type_lower, "multipart/signed") &&
 	    strstr (header_content_type_lower, "application/")) {
 		g_free (header_content_type_lower);
 		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);
+	}
+
+	if (header_content_type_lower &&
+	    g_str_has_prefix (header_content_type_lower, "multipart/related"))
+		is_related = TRUE;
+
+	g_free (header_content_type_lower);
+	g_free (header_content_type);
+
+	parts = TNY_LIST (tny_simple_list_new());
+	tny_mime_part_get_parts (TNY_MIME_PART (msg), parts);
+
+	/* no parts? assume it's single-part message */
+	iter  = tny_list_create_iterator (parts);
+	if (tny_iterator_is_done(iter)) {
+		gchar *content_type;
+		gboolean is_text_part;
+
+		content_type = modest_tny_mime_part_get_content_type (msg);
+		if (content_type == NULL)
+			goto frees;
+		is_text_part = g_str_has_prefix (content_type, "text/");
+		g_free (content_type);
+
+		/* if this part cannot be a supported body return NULL */
+		if (is_text_part)
+			part = TNY_MIME_PART (g_object_ref(G_OBJECT(msg)));
+	} else {
+		TnyMimePart *fallback = NULL;
+		do {
+			gchar *tmp, *content_type = NULL;
+			gboolean has_content_disp_name = FALSE;
+
+			part = TNY_MIME_PART(tny_iterator_get_current (iter));
+
+			if (!part) {
+				g_warning ("%s: not a valid mime part", __FUNCTION__);
+				tny_iterator_next (iter);
+				continue;
+			}
+
+			/* it's a message --> ignore */
+			if (part && TNY_IS_MSG (part)) {
+				g_object_unref (part);
+				part = NULL;
+				tny_iterator_next (iter);
+				continue;
+			}			
+
+			/* we need to strdown the content type, because
+			 * tny_mime_part_has_content_type does not do it...
+			 */
+			content_type = g_ascii_strdown (tny_mime_part_get_content_type (part), -1);
+
+			/* mime-parts with a content-disposition header (either 'inline' or 'attachment')
+			 * and a 'name=' thingy cannot be body parts
+                         */
+
+			tmp = modest_tny_mime_part_get_header_value (part, "Content-Disposition");
+			if (tmp) {
+				gchar *content_disp = g_ascii_strdown(tmp, -1);
+				g_free (tmp);
+				has_content_disp_name = g_strstr_len (content_disp, strlen(content_disp), "name=") != NULL;
+				g_free (content_disp);
+			}
+
+			if (g_str_has_prefix (content_type, "text/") &&
+			    !has_content_disp_name &&
+			    !modest_tny_mime_part_is_attachment_for_modest (part)) {
+				/* We found that some multipart/related emails include
+				   empty text/plain parts at the end that could confuse the body
+				   detection algorithm */
+				if (is_related && g_str_has_prefix (content_type, "text/plain")) {
+					fallback = g_object_ref (part);
+				} else {
+					/* we found the body. Doesn't have to be the desired mime part, first
+					   text/ part in a multipart/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! */
+				g_object_unref (part);
+				g_free (content_type);
+				part = modest_tny_msg_find_body_part_from_mime_part (part, want_html);
+				if (part)
+					break;
+			} else {
+				g_free (content_type);
+			}
+
+			if (part) {
+				g_object_unref (G_OBJECT(part));
+				part = NULL;
+			}
+			tny_iterator_next (iter);
+
+		} while (!tny_iterator_is_done(iter));
+
+		if (!part && fallback)
+			part = g_object_ref (fallback);
+		if (fallback)
+			g_object_unref (fallback);
+	}
+
+ frees:
+	g_object_unref (G_OBJECT(iter));
+	g_object_unref (G_OBJECT(parts));
+
+	return part;
+}
+
+static TnyMimePart*
+modest_tny_msg_find_calendar_from_mime_part (TnyMimePart *msg)
+{
+	TnyMimePart *part = NULL;
+	TnyList *parts = NULL;
+	TnyIterator *iter = NULL;
+	gchar *header_content_type;
+	gchar *header_content_type_lower = NULL;
+	
+	if (!msg)
+		return NULL;
+
+	/* If it's an application multipart, then we don't get into as we don't
+	 * support them (for example application/sml or wap messages */
+	header_content_type = modest_tny_mime_part_get_header_value (msg, "Content-Type");
+	if (header_content_type) {
+		header_content_type = g_strstrip (header_content_type);
+		header_content_type_lower = g_ascii_strdown (header_content_type, -1);
+	}
+	if (header_content_type_lower && 
+	    g_str_has_prefix (header_content_type_lower, "multipart/") &&
+	    !g_str_has_prefix (header_content_type_lower, "multipart/signed") &&
+	    strstr (header_content_type_lower, "application/")) {
+		g_free (header_content_type_lower);
+		g_free (header_content_type);
+		return NULL;
 	}	
 	g_free (header_content_type_lower);
 	g_free (header_content_type);
@@ -542,16 +715,16 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht
 	/* no parts? assume it's single-part message */
 	if (tny_iterator_is_done(iter)) {
 		gchar *content_type;
-		gboolean is_text_part;
+		gboolean is_calendar_part;
 		g_object_unref (G_OBJECT(iter));
 		content_type = modest_tny_mime_part_get_content_type (msg);
 		if (content_type == NULL)
 			return NULL;
-		is_text_part = 
-			g_str_has_prefix (content_type, "text/");
+		is_calendar_part = 
+			g_str_has_prefix (content_type, "text/calendar");
 		g_free (content_type);
 		/* if this part cannot be a supported body return NULL */
-		if (!is_text_part) {
+		if (!is_calendar_part) {
 			return NULL;
 		} else {
 			return TNY_MIME_PART (g_object_ref(G_OBJECT(msg)));
@@ -594,7 +767,7 @@ 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, "text/") && 
+			if (g_str_has_prefix (content_type, "text/calendar") && 
 			    !has_content_disp_name &&
 			    !modest_tny_mime_part_is_attachment_for_modest (part)) {
 				/* we found the body. Doesn't have to be the desired mime part, first
@@ -602,21 +775,12 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht
 				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! */
 				g_object_unref (part);
 				g_free (content_type);
-				part = modest_tny_msg_find_body_part_from_mime_part (part, want_html);
+				part = modest_tny_msg_find_calendar_from_mime_part (part);
 				if (part)
 					break;
 			} else
@@ -649,6 +813,14 @@ modest_tny_msg_find_body_part (TnyMsg *msg, gboolean want_html)
 							     want_html);
 }
 
+TnyMimePart*
+modest_tny_msg_find_calendar (TnyMsg *msg)
+{
+	g_return_val_if_fail (msg && TNY_IS_MSG(msg), NULL);
+	
+	return modest_tny_msg_find_calendar_from_mime_part (TNY_MIME_PART(msg));
+}
+
 
 #define MODEST_TNY_MSG_PARENT_UID "parent-uid"
 
@@ -1271,6 +1443,36 @@ modest_tny_msg_create_reply_msg (TnyMsg *msg,
 	return new_msg;
 }
 
+TnyMsg*
+modest_tny_msg_create_reply_calendar_msg (TnyMsg *msg,
+					  TnyHeader *header,
+					  const gchar *from,
+					  const gchar *signature,
+					  TnyList *headers)
+{
+	TnyMsg *new_msg = NULL;
+	TnyIterator *iterator;
+
+	g_return_val_if_fail (msg && TNY_IS_MSG(msg), NULL);
+
+	new_msg = modest_tny_msg_create_reply_msg (msg, header, from, signature,  
+						   MODEST_TNY_MSG_REPLY_TYPE_QUOTE, MODEST_TNY_MSG_REPLY_MODE_SENDER);
+
+	iterator = tny_list_create_iterator (headers);
+	while (!tny_iterator_is_done (iterator)) {
+		TnyPair *pair = TNY_PAIR (tny_iterator_get_current (iterator));
+
+		tny_mime_part_set_header_pair (TNY_MIME_PART (new_msg),
+					       tny_pair_get_name (pair),
+					       tny_pair_get_value (pair));
+		g_object_unref (pair);
+		tny_iterator_next (iterator);
+	}
+	g_object_unref (iterator);
+
+	return new_msg;
+}
+
 
 static gboolean
 is_ascii(const gchar *s)