[Xfce4-commits] <postler:master> Handle trailing '=' once and don't append new-line

[Christian Dywan]

Updating branch refs/heads/master
         to 9e76863824721efb1560c0d4c23adc25d63b4c16 (commit)
       from e1349ebf888fb27906d0b26baddd804361b03099 (commit)

commit 9e76863824721efb1560c0d4c23adc25d63b4c16
Author: Christian Dywan <christian at twotoasts.de>
Date:   Thu Dec 16 00:05:40 2010 +0100

    Handle trailing '=' once and don't append new-line
    
    Fixes: https://bugs.launchpad.net/postler/+bug/690750

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

diff --git a/postler/postler-content.vala b/postler/postler-content.vala
index 0f2ebff..00da4f7 100644
--- a/postler/postler-content.vala
+++ b/postler/postler-content.vala
@@ -347,8 +347,7 @@ public class Postler.Content : WebKit.WebView {
 
     internal static string quoted_printable_decode (string quoted) {
         /* =20 is not hex-encoded, to faciliate quote handling */
-        string unquoted = quoted.replace (" =", " ")
-            .replace ("_", " ").replace ("=20", " ");
+        string unquoted = quoted.replace ("_", " ").replace ("=20", " ");
         try {
             var regex = new GLib.Regex ("([=]([0-9A-F][0-9A-F]))");
             return regex.replace (unquoted, -1, 0, "&#x\\2;");
@@ -840,7 +839,8 @@ public class Postler.Content : WebKit.WebView {
                     message_part.body.append (line);
                     if (content_encoding == "quoted-printable" && line.has_suffix ("="))
                         message_part.body.truncate (message_part.body.len - 1);
-                    message_part.body.append (message_part.plain_text ? "<br>" : " ");
+                    else
+                        message_part.body.append (message_part.plain_text ? "<br>" : " ");
                 }
             }
         } catch (GLib.Error error) {