Mark both latest patches as forwarded
[debian/pino.git] / debian / patches / 004_fix-search-regex.diff
index 6774c87..44bf562 100644 (file)
@@ -1,11 +1,12 @@
 Description: Fix regex for search/tags
 Author: Julien Valroff <julien@kirya.net>
 Bug: http://code.google.com/p/pino-twitter/issues/detail?id=141
+Forwarded: yes
 
 Index: pino/src/template.vala
 ===================================================================
---- pino.orig/src/template.vala        2010-05-23 15:20:25.000000000 +0200
-+++ pino/src/template.vala     2010-05-23 15:20:53.000000000 +0200
+--- pino.orig/src/template.vala        2010-05-23 15:26:40.000000000 +0200
++++ pino/src/template.vala     2010-05-23 15:29:14.000000000 +0200
 @@ -60,7 +60,7 @@
                
                //compile regex
@@ -15,3 +16,12 @@ Index: pino/src/template.vala
                groups = new Regex("(^|\\s)!([A-Za-z0-9_]+)"); //for identi.ca groups
                urls = new Regex("((http|https|ftp)://([\\S]+))"); //need something better
                
+@@ -400,7 +400,7 @@
+               }
+               
+               result = nicks.replace(result, -1, 0, "\\1@<a class='re_nick' href='userinfo://\\2'>\\2</a>");
+-              result = tags.replace(result, -1, 0, "<a class='tags' href='%s\\1'>\\1</a>".printf(search_url));
++              result = tags.replace(result, -1, 0, "\\1#<a class='tags' href='%s\\2'>\\2</a>".printf(search_url));
+               
+               if(service == "identi.ca") //for identi.ca only
+                       result = groups.replace(result, -1, 0, "\\1!<a class='tags' href='http://identi.ca/group/\\2'>\\2</a>");