[Xfce4-commits] <postler:master> Don't escape or format text in CellRendererConvo

[Christian Dywan]

Updating branch refs/heads/master
         to e703144b916496f3f1591aa3097fae09ffcc48b4 (commit)
       from 340c93c07c472ae90827d49441a27315a2d12481 (commit)

commit e703144b916496f3f1591aa3097fae09ffcc48b4
Author: Christian Dywan <christian at twotoasts.de>
Date:   Fri Jul 8 00:16:02 2011 +0200

    Don't escape or format text in CellRendererConvo

 postler/postler-messages.vala |   40 +++-------------------------------------
 1 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/postler/postler-messages.vala b/postler/postler-messages.vala
index 0cf4a5a..a6e0061 100644
--- a/postler/postler-messages.vala
+++ b/postler/postler-messages.vala
@@ -54,40 +54,6 @@ public class Postler.Messages : Gtk.TreeView {
         return fallback.str;
     }
 
-    static string escape_text (string text) {
-        /* Like Markup.escape_text, but including UTF-8 validation */
-        var escaped = new StringBuilder.sized (text.size () * 2);
-        for (unowned string s = text; s.get_char () != 0 ; s = s.next_char ()) {
-            unichar character = s.get_char ();
-            switch (character) {
-            case '&':
-                escaped.append ("&");
-                break;
-            case '<':
-                escaped.append ("<");
-                break;
-            case '>':
-                escaped.append (">");
-                break;
-            case '\'':
-                escaped.append ("'");
-                break;
-            case '"':
-                escaped.append (""");
-                break;
-            default:
-                if (character.iscntrl ())
-                    escaped.append_c (' ');
-                else if (!character.validate ())
-                    escaped.append_unichar ('�');
-                else
-                    escaped.append_unichar (character);
-                break;
-            }
-        }
-        return escaped.str;
-    }
-
     void render_flag (Gtk.CellLayout layout, Gtk.CellRenderer cell,
         Gtk.TreeModel model, Gtk.TreeIter iter) {
         Message message;
@@ -128,9 +94,9 @@ public class Postler.Messages : Gtk.TreeView {
             return;
         }
 
-        renderer.subject = escape_text (message.subject ?? _("No subject"));
+        renderer.subject = message.subject ?? _("No subject");
         renderer.date = Postler.Content.format_date (message.date);
-        renderer.sender = escape_text (Postler.Contact.name_from_string (message.sender));
+        renderer.sender = Postler.Contact.name_from_string (message.sender);
         renderer.replies = (int)message.replies;
         renderer.priority = message.priority;
         renderer.text = message.excerpt + "…";
@@ -380,7 +346,7 @@ public class Postler.Messages : Gtk.TreeView {
 
     public void display_error (string title, string text) {
         clear ();
-        string markup = "<big><b>%s</b></big>\n\n%s".printf (title, text);
+        string markup = "%s\n%s".printf (title, text);
         var message = new Message.from_id ("error:");
         message.from_error (markup);
         store.insert_with_values (null, null, 0,