[Xfce4-commits] <postler:master> Only change _ to ' ' in Q-encoded subjects

[Christian Dywan]

Updating branch refs/heads/master
         to 43e711f75d2fa370f3027f4139d557dddaf0799e (commit)
       from 4b07864f19f4caeee49402d52c62040c08b161b4 (commit)

commit 43e711f75d2fa370f3027f4139d557dddaf0799e
Author: Christian Dywan <christian at twotoasts.de>
Date:   Mon Feb 7 11:33:46 2011 +0100

    Only change _ to ' ' in Q-encoded subjects

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

diff --git a/postler/postler-content.vala b/postler/postler-content.vala
index 0faad97..0162c1b 100644
--- a/postler/postler-content.vala
+++ b/postler/postler-content.vala
@@ -388,7 +388,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 ("=20", " ");
+        string unquoted = quoted.replace ("=20", " ");
         try {
             var regex = new GLib.Regex ("([=]([0-9A-F][0-9A-F]))");
             return regex.replace_eval (unquoted, -1, 0, 0, evaluate_hex);
diff --git a/postler/postler-messages.vala b/postler/postler-messages.vala
index dc863b8..8a6bfa0 100644
--- a/postler/postler-messages.vala
+++ b/postler/postler-messages.vala
@@ -357,7 +357,7 @@ public class Postler.Messages : Gtk.TreeView {
             return encoded;
         string unquoted;
         if (encoding == 'Q') {
-            unquoted = pieces[0].replace (" =", " ");
+            unquoted = pieces[0].replace (" =", " ").replace ("_", " ");
             unquoted = Postler.Content.quoted_printable_decode (unquoted);
         }
         else if (encoding == 'B')