[Xfce4-commits] <postler:master> Merge text and html parts separately

[Christian Dywan]

Updating branch refs/heads/master
         to ffb276db7137355960cc1b7d98c76d6d337ec360 (commit)
       from 317b4fb94f4ddf7d53cea0f41e7827923f3fceea (commit)

commit ffb276db7137355960cc1b7d98c76d6d337ec360
Author: Christian Dywan <christian at twotoasts.de>
Date:   Wed Feb 2 21:39:18 2011 +0100

    Merge text and html parts separately

 postler/postler-content.vala |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/postler/postler-content.vala b/postler/postler-content.vala
index f933aac..76447cb 100644
--- a/postler/postler-content.vala
+++ b/postler/postler-content.vala
@@ -972,9 +972,9 @@ public class Postler.Content : WebKit.WebView {
                         html_part.body.append (part.body.str);
                         message_parts.remove (part);
                     }
-                    else if (text_part == null)
+                    if (text_part == null)
                         text_part = part;
-                    else {
+                    else if (part.content_disposition == "inline") {
                         text_part.body.append (part.body.str);
                         message_parts.remove (part);
                     }