[geary] Don't strip trailing space from signature separator



commit 17b481d94978da4359a04b72cc5e6b70c2e73705
Author: Robert Schroll <rschroll gmail com>
Date:   Fri Sep 19 13:09:52 2014 -0400

    Don't strip trailing space from signature separator
    
    https://bugzilla.gnome.org/show_bug.cgi?id=736985

 src/client/util/util-webkit.vala |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/src/client/util/util-webkit.vala b/src/client/util/util-webkit.vala
index e998bd4..4bf3d4c 100644
--- a/src/client/util/util-webkit.vala
+++ b/src/client/util/util-webkit.vala
@@ -339,7 +339,10 @@ public string html_to_flowed_text(WebKit.DOM.HTMLElement el) {
     string[] lines = doctext.split("\n");
     GLib.StringBuilder flowed = new GLib.StringBuilder.sized(doctext.length);
     foreach (string line in lines) {
-        line = line.chomp();
+        // Strip trailing whitespace, so it doesn't look like a flowed line.  But the
+        // signature separator "-- " is special, so leave that alone.
+        if (line != "-- ")
+            line = line.chomp();
         int quote_level = 0;
         while (line[quote_level] == Geary.RFC822.Utils.QUOTE_MARKER)
             quote_level += 1;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]