X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-attachment-view.c;h=f2a3eaaf0866c603d55346c8ab085f73b8633385;hp=7c7cae449b1c4c422466b0dd4d8cf2fc82e739ed;hb=d2ea95049c43f1fc3089109866757e45139d0d9a;hpb=5b68f7c4a513a7a6f45549e7bf40838ce754db27

diff --git a/src/widgets/modest-attachment-view.c b/src/widgets/modest-attachment-view.c
index 7c7cae4..f2a3eaa 100644
--- a/src/widgets/modest-attachment-view.c
+++ b/src/widgets/modest-attachment-view.c
@@ -37,6 +37,7 @@
 #include <modest-attachment-view.h>
 #include <modest-platform.h>
 #include <modest-text-utils.h>
+#include <modest-tny-mime-part.h>
 #include <tny-msg.h>
 #include <modest-mail-operation.h>
 #include <modest-mail-operation-queue.h>
@@ -66,7 +67,11 @@ struct _ModestAttachmentViewPrivate
 
 };
 
+#ifdef MODEST_TOOLKIT_HILDON2
+#define UNKNOWN_FILE_ICON "filemanager_unknown_file_48"
+#else
 #define UNKNOWN_FILE_ICON "qgn_list_gene_unknown_file"
+#endif
 
 #define MODEST_ATTACHMENT_VIEW_GET_PRIVATE(o)	\
 	(G_TYPE_INSTANCE_GET_PRIVATE ((o), MODEST_TYPE_ATTACHMENT_VIEW, ModestAttachmentViewPrivate))
@@ -252,12 +257,24 @@ modest_attachment_view_set_part_default (TnyMimePartView *self, TnyMimePart *mim
 				filename = tny_header_dup_subject (header);
 			if (filename == NULL || filename[0] == '\0')
 				filename = g_strdup (_("mail_va_no_subject"));
-			if (priv->is_purged)
+			if (priv->is_purged) {
 				file_icon_name = modest_platform_get_file_icon_name (NULL, NULL, NULL);
-			else
-				file_icon_name = 
-					modest_platform_get_file_icon_name (
-						NULL, tny_mime_part_get_content_type (mime_part), NULL);
+			} else {
+				gchar *header_content_type;
+				header_content_type = modest_tny_mime_part_get_content_type (mime_part);
+				if ((g_str_has_prefix (header_content_type, "message/rfc822") ||
+				     g_str_has_prefix (header_content_type, "multipart/") ||
+				     g_str_has_prefix (header_content_type, "text/"))) {
+					file_icon_name = 
+						modest_platform_get_file_icon_name (
+							NULL, tny_mime_part_get_content_type (mime_part), NULL);
+				} else {
+					file_icon_name = 
+						modest_platform_get_file_icon_name (
+							NULL, header_content_type, NULL);
+				}
+				g_free (header_content_type);
+			}
 			g_object_unref (header);
 		}
 	} else {
@@ -266,7 +283,7 @@ modest_attachment_view_set_part_default (TnyMimePartView *self, TnyMimePart *mim
 			file_icon_name = modest_platform_get_file_icon_name (NULL, NULL, NULL);
 		} else {
 			file_icon_name = modest_platform_get_file_icon_name (
-				filename, tny_mime_part_get_content_type (mime_part), NULL);
+				filename, modest_tny_mime_part_get_content_type (mime_part), NULL);
 			show_size = TRUE;
 		}
 	}