Merge lp:~julien-spautz/cable/regex into lp:cable

[Julien Spautz]

Fix ping markup and url markup mess.

=== modified file 'src/Widgets/ChatDisplay.vala'
--- src/Widgets/ChatDisplay.vala	2013-07-14 14:47:42 +0000
+++ src/Widgets/ChatDisplay.vala	2013-07-14 20:18:25 +0000
@@ -10,7 +10,7 @@
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
     Lesser General Public License for more details.
- 
+
     You should have received a copy of the GNU Lesser General
     Public License along with this library; if not, write to the
     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
@@ -18,10 +18,10 @@
 ***/
 
 public class Cable.Widgets.ChatDisplay : Gtk.EventBox {
-    
+
     private Gtk.Grid main_grid;
     private int line = 0;
-    
+
     public ChatDisplay () {
         this.get_style_context ().add_class (Granite.StyleClass.CONTENT_VIEW);
         main_grid = new Gtk.Grid ();
@@ -32,14 +32,20 @@
         expand = true;
         this.add (main_grid);
     }
-    
-    public void add_message (string user, string message) {
+
+    public void add_message (string user, string msg) {
+
+        var regex = /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[.!\/\\w]*))?)/;
+        var message = regex.replace (msg, -1, 0, "<a href=\"\\1\">\\1</a>");
+
         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.use_markup = true;
+        debug (message);
         message_label.set_markup (message);
         message_label.hexpand = true;
         main_grid.attach (user_label, 0, line, 1, 1);
@@ -48,6 +54,6 @@
         message_label.show ();
         line++;
     }
-    
-    
+
+
 }