Merge lp:~ken-vandine/gwibber/twitter-entities into lp:~markjtully/gwibber/twitter-entities

[Ken VanDine]

Better handling of link_description in the client

[Mark Tully (markjtully)]

review: Approve

=== modified file 'libgwibber/streams.vala'
--- libgwibber/streams.vala	2012-02-23 04:46:15 +0000
+++ libgwibber/streams.vala	2012-03-01 22:26:18 +0000
@@ -675,25 +675,16 @@
             /* escape markup in some strings, pango doesn't like it */
             if (_link_name != null)
               _link_name = GLib.Markup.escape_text (_link_name);
-            if (_link_description != null)
-              _link_description = GLib.Markup.escape_text (_link_description);
             if (_image_name != null)
               _image_name = GLib.Markup.escape_text (_image_name);
             if (_video_name != null)
               _video_name = GLib.Markup.escape_text (_video_name);
 
-            /* FIXME: hacky scrubbing of the html, we should find a 
-               better way */
             if (_html != null)
-              _html = _html.replace("&query", "&query");
-              _html = _html.replace("&name", "&name");
-              _html = _html.replace("class=\"nick\"", "");
-              _html = _html.replace("class=\"hash\"", "");
-              _html = _html.replace("<p>", "");
-              _html = _html.replace("</p>", "");
-              _html = _html.replace("<b>", "");
-              _html = _html.replace("</b>", "");
-              //debug ("_html: %s", _html);
+              _html = scrub (_html);
+
+            if (_link_description != null)
+              _link_description = scrub (_link_description);
 
             string _t = utils.generate_time_string(_time);
 
@@ -769,6 +760,24 @@
             //debug ("_model has %u ROWS", _model.get_n_rows ());
         }
 
+        private string scrub (string content)
+        {
+          /* FIXME: hacky scrubbing of the html, we should find a 
+          better way */
+          string res = content;
+          res = res.replace("&query", "&amp;query");
+          res = res.replace("&name", "&amp;name");
+          res = res.replace("class=\"nick\"", "");
+          res = res.replace("class=\"hash\"", "");
+          res = res.replace("<p>", "");
+          res = res.replace("</p>", "");
+          res = res.replace("<b>", "");
+          res = res.replace("</b>", "");
+          //debug ("res: %s", res);
+          return res;
+        }
+
+
 
         /**
          * com.Gwibber.Streams