X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-mime-part.c;h=bd66d0244ea8ac42e3b73e0018cba121dda8b8af;hp=993664ddb05f04f1ab59290e99f67a39fc19f053;hb=7c966d893beecfa2f2d5ed4b8fe4ad5a0ae4247e;hpb=3aaa3f4b34256495c99197096625357b66c00289

diff --git a/src/modest-tny-mime-part.c b/src/modest-tny-mime-part.c
index 993664d..bd66d02 100644
--- a/src/modest-tny-mime-part.c
+++ b/src/modest-tny-mime-part.c
@@ -94,9 +94,22 @@ modest_tny_mime_part_is_attachment_for_modest (TnyMimePart *part)
 	
 	tmp = modest_tny_mime_part_get_header_value (part, "Content-Disposition");
 	if (tmp) {
+		/* If the Content-Disposition header contains a "name"
+		 * parameter, treat the mime part as an attachment */
 		gchar *content_disp = g_ascii_strdown(tmp, -1);
+		gint len = strlen (content_disp);
+		const gchar *substr = g_strstr_len (content_disp, len, "name");
+		if (substr != NULL) {
+			gint substrlen = len - (substr - content_disp);
+			/* The parameter can appear in muliple
+			 * ways. See RFC 2231 for details */
+			has_content_disp_name =
+				g_strstr_len (substr, substrlen, "name=") != NULL ||
+				g_strstr_len (substr, substrlen, "name*=") != NULL ||
+				g_strstr_len (substr, substrlen, "name*0=") != NULL ||
+				g_strstr_len (substr, substrlen, "name*0*=") != NULL;
+		}
 		g_free (tmp);
-		has_content_disp_name = g_strstr_len (content_disp, strlen(content_disp), "name=") != NULL;
 		g_free (content_disp);
 	}
 		
@@ -194,3 +207,47 @@ modest_tny_mime_part_to_string (TnyMimePart *part, gint indent)
 	g_string_free (indent_prefix, TRUE);
 }
 
+gchar *
+modest_tny_mime_part_get_headers_content_type (TnyMimePart *part)
+{
+	gchar *header_content_type;
+	gchar *header_content_type_lower;
+	gchar *suffix;
+
+	g_return_val_if_fail (TNY_IS_MIME_PART (part), NULL);
+
+	header_content_type = modest_tny_mime_part_get_header_value (part, "Content-Type");
+
+	if (!header_content_type)
+		return NULL;
+
+	header_content_type = g_strstrip (header_content_type);
+
+	/* remove the ; suffix */
+	suffix = index (header_content_type, ';');
+	suffix[0] = '\0';
+
+	header_content_type_lower = (header_content_type ) ?
+		g_ascii_strdown (header_content_type, -1) : NULL;
+	return header_content_type_lower;
+}
+
+gchar *
+modest_tny_mime_part_get_content_type (TnyMimePart *part)
+{
+	const gchar *content_type;
+	gchar *retval = NULL;
+
+	g_return_val_if_fail (TNY_IS_MIME_PART (part), NULL);
+	content_type = tny_mime_part_get_content_type (part);
+
+	if (g_str_has_prefix (content_type, "message/rfc822")) {
+		retval = modest_tny_mime_part_get_headers_content_type (part);
+	} 
+
+	if (retval == NULL) {
+		retval = g_ascii_strdown (content_type, -1);
+	}
+
+	return retval;
+}