From: José Dapena Paz <jdapena@igalia.com>
Date: Thu, 21 Jan 2010 09:22:00 +0000 (+0100)
Subject: Better attachments detection for text/calendar
X-Git-Tag: 3.2.11~7
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=50ed28fb11779362d91b27cf5e9b5e0fccb252ae

Better attachments detection for text/calendar
---

diff --git a/src/modest-tny-mime-part.c b/src/modest-tny-mime-part.c
index 8f04082..3e9a473 100644
--- a/src/modest-tny-mime-part.c
+++ b/src/modest-tny-mime-part.c
@@ -171,7 +171,8 @@ modest_tny_mime_part_is_msg (TnyMimePart *part)
 	down_content_type = g_ascii_strdown (content_type, -1);
 	if ((g_str_has_prefix (down_content_type, "message/rfc822") ||
 	     g_str_has_prefix (down_content_type, "multipart/") ||
-	     g_str_has_prefix (down_content_type, "text/"))) {
+	     g_str_has_prefix (down_content_type, "text/plain") ||
+	     g_str_has_prefix (down_content_type, "text/html"))) {
 		g_free (down_content_type);
 		return TRUE;
 	} else {
diff --git a/src/widgets/modest-attachments-view.c b/src/widgets/modest-attachments-view.c
index e7d5a5c..64ce3a9 100644
--- a/src/widgets/modest-attachments-view.c
+++ b/src/widgets/modest-attachments-view.c
@@ -187,7 +187,8 @@ modest_attachments_view_set_message (ModestAttachmentsView *attachments_view, Tn
 
 		direct_attach = (!g_str_has_prefix (msg_content_type, "message/rfc822") && 
 				 !g_str_has_prefix (msg_content_type, "multipart") && 
-				 !g_str_has_prefix (msg_content_type, "text/"));
+				 !g_str_has_prefix (msg_content_type, "text/plain") &&
+				 !g_str_has_prefix (msg_content_type, "text/html"));
 
 		g_free (msg_content_type);
 
@@ -219,10 +220,13 @@ modest_attachments_view_set_message (ModestAttachmentsView *attachments_view, Tn
 
 			if (g_str_has_prefix (content_type, "multipart/digest")) {
 				add_digest_attachments (attachments_view, part);
-			} else if (body_found && g_str_has_prefix (content_type, "text/")) {
+			} else if (body_found && 
+				   (g_str_has_prefix (content_type, "text/plain") ||
+				    g_str_has_prefix (content_type, "text/html"))) {
 				   modest_attachments_view_add_attachment (attachments_view, part, TRUE, 0);
 			} else if (g_str_has_prefix (content_type, "multipart/") || 
-				   g_str_has_prefix (content_type, "text/")) {
+				   g_str_has_prefix (content_type, "text/plain") ||
+				   g_str_has_prefix (content_type, "text/html")) {
 				body_found = TRUE;
 			}
 		}