Merge lp:~mefrio-g/cable/1201076 into lp:cable

[Mario Guerriero]

[Eduard Gotwig (gotwig)]

need to add www. to the RegEx.

review: Needs Fixing

[Eduard Gotwig (gotwig)]

No its not fine now.

Pinged messages to the user (which are normaly red) are not visible anymore.

They are not anymore red with this branch

review: Needs Fixing

[Eduard Gotwig (gotwig)]

This got fixed upstream, by julien.

=== modified file 'src/Widgets/ChatDisplay.vala'
--- src/Widgets/ChatDisplay.vala	2013-07-04 01:34:38 +0000
+++ src/Widgets/ChatDisplay.vala	2013-07-14 09:38:27 +0000
@@ -34,13 +34,31 @@
     }
     
     public void add_message (string user, string message) {
+        StringBuilder msg = new StringBuilder ();
+        var split = message.split (" ");
+        for (int n = 0; n < split.length; n++) {
+            try {
+                var regex = new GLib.Regex ("^(?:http://)?([^/]+)(?:/?.*/?)/(.*)$");
+                bool is_url = regex.match (split[n], 0);
+                if (is_url)
+                    msg.append ("<a href=\"" + split[n] + "\">" + split[n] + "</a>");
+                else
+                    msg.append (split[n]);
+                msg.append (" ");
+            } catch (GLib.RegexError error) {
+                warning (error.message);
+            }
+        }
+        
         var user_label = new Gtk.Label ("");
         user_label.set_markup (user);
         user_label.set_alignment (1, 0);
         user_label.width_request = 80;
         user_label.ellipsize = Pango.EllipsizeMode.END;
         var message_label = new Granite.Widgets.WrapLabel ("");
-        message_label.set_markup (message);
+        message_label.use_markup = true;
+        debug (msg.str);
+        message_label.set_markup (msg.str);
         message_label.hexpand = true;
         main_grid.attach (user_label, 0, line, 1, 1);
         main_grid.attach (message_label, 1, line, 1, 1);