[Xfce4-commits] <postler:master> Show 'Open' and 'Save' for all but plain and HTML

[Christian Dywan]

Updating branch refs/heads/master
         to 5ed41e952b42a88e1a6957de148b6896b312f59e (commit)
       from fb2dd0d17a8eb3e11bf2bc319f1e09273b22b621 (commit)

commit 5ed41e952b42a88e1a6957de148b6896b312f59e
Author: Christian Dywan <christian at twotoasts.de>
Date:   Thu Dec 2 02:03:19 2010 +0100

    Show 'Open' and 'Save' for all but plain and HTML

 postler/postler-content.vala |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/postler/postler-content.vala b/postler/postler-content.vala
index bb34b58..0a30ce2 100644
--- a/postler/postler-content.vala
+++ b/postler/postler-content.vala
@@ -819,21 +819,16 @@ public class Postler.Content : WebKit.WebView {
         string mime_type = message_part.mime_type;
         if (mime_type == "text/html")
             body_chunk = message_part.body.str;
-        else if (mime_type_is_text (mime_type)) {
+        else if (message_part.plain_text) {
             mime_type = "text/html";
             body_chunk = "<span class=\"plain_text\">" + message_part.body.str + "</span>";
         }
-        else if (mime_type.has_prefix ("image/")) {
-            mime_type = "text/html";
-            body_chunk = "<img src=\"data:image/jpg;base64,%s\">".printf (
-                message_part.body.str);
-        }
         else {
             mime_type = "text/html";
             body_chunk = """
                 <b>%s</b>
-                <p><a href="message-part:open:%d">%s</a>
-                <p><a href="message-part:save:%d">%s</a>
+                <a href="message-part:open:%d">%s</a>
+                <a href="message-part:save:%d">%s</a>
                 """.
                 printf (
                 message_part.filename ?? message_part.mime_type,
@@ -841,6 +836,12 @@ public class Postler.Content : WebKit.WebView {
                 _("Open file"),
                 message_parts.position (message_parts.find (message_part)),
                 _("Save As..."));
+            if (mime_type_is_text (message_part.mime_type))
+                body_chunk += "<p><span class=\"plain_text\">%s</span>".
+                    printf (message_part.body.str);
+            else if (message_part.mime_type.has_prefix ("image/"))
+                body_chunk += "<p><img src=\"data:image/jpg;base64,%s\">".
+                    printf (message_part.body.str);
         }
 
         try {