* Simple UTF8 support for string comparison.

[modest] / src / modest-tny-msg-view.c

diff --git a/src/modest-tny-msg-view.c b/src/modest-tny-msg-view.c
index a57ff02..13ece7a 100644 (file)
--- a/src/modest-tny-msg-view.c
+++ b/src/modest-tny-msg-view.c
@@ -167,7 +167,7 @@ modest_tny_msg_view_new (TnyMsgIface *msg, const gboolean show_attachments_inlin
                                       GTK_POLICY_AUTOMATIC);
 
        if (priv->gtkhtml) 
-               gtk_container_add (GTK_CONTAINER(obj), priv->gtkhtml);  
+               gtk_container_add (GTK_CONTAINER(obj), priv->gtkhtml);
        
        if (msg)
                modest_tny_msg_view_set_message (self, msg);
@@ -774,25 +774,19 @@ modest_tny_msg_view_set_message (ModestTnyMsgView *self, TnyMsgIface *msg)
        priv->msg = msg;
        
        fill_gtkhtml_with_txt (self, GTK_HTML(priv->gtkhtml), "", msg);
-
        if (!msg) 
                return;
        
-       body = modest_tny_msg_actions_find_body_part (msg, "text/html");
+       body = modest_tny_msg_actions_find_body_part (msg, TRUE);
        if (body) {
-               set_html_message (self, body, msg);
-               return;
-       }
-       
-       body = modest_tny_msg_actions_find_body_part (msg, "text/plain");
-       if (body) {
-               set_text_message (self, body, msg);
+               if (tny_msg_mime_part_iface_content_type_is (body, "text/html"))
+                       set_html_message (self, body, msg);
+               else
+                       set_text_message (self, body, msg);
                return;
+       } else {
+               /* nothing to show */
        }
-
-       /* hmmmmm */
-       fill_gtkhtml_with_txt (self, GTK_HTML(priv->gtkhtml),
-                               _("Unsupported message type"), msg);
 }
 
 void