[Goodies-commits] r1831 - in verve-plugin/trunk: . panel-plugin

[Jannis Pohlmann]

Author: jannis
Date: 2006-08-01 22:39:08 +0000 (Tue, 01 Aug 2006)
New Revision: 1831

Modified:
   verve-plugin/trunk/ChangeLog
   verve-plugin/trunk/panel-plugin/verve.c
Log:
	* panel-plugins/verve.c: Add "/?" to the URL expressions. This
	  way URIs with a trailing "/" are properly recognized as URIs.
	  Fixes bug #2102.

Modified: verve-plugin/trunk/ChangeLog
===================================================================
--- verve-plugin/trunk/ChangeLog	2006-08-01 20:31:29 UTC (rev 1830)
+++ verve-plugin/trunk/ChangeLog	2006-08-01 22:39:08 UTC (rev 1831)
@@ -1,3 +1,9 @@
+2006-08-02	Jannis Pohlmann <jannis at xfce.org>
+
+	* panel-plugins/verve.c: Add "/?" to the URL expressions. This
+	  way URIs with a trailing "/" are properly recognized as URIs.
+	  Fixes bug #2102.
+
 2006-08-01	Jannis Pohlmann <jannis at xfce.org>
 
 	* panel-plugin/verve-plugin.c: Executes commands when GDK_KP_Enter 
@@ -331,3 +337,5 @@
 	  of the list added
 	* src/verve-plugin.c: Use newly added history function when 
 	  pressing GDK_Down
+
+# vi:set ts=8 sw=8 tw=72 noet ai nocindent:

Modified: verve-plugin/trunk/panel-plugin/verve.c
===================================================================
--- verve-plugin/trunk/panel-plugin/verve.c	2006-08-01 20:31:29 UTC (rev 1830)
+++ verve-plugin/trunk/panel-plugin/verve.c	2006-08-01 22:39:08 UTC (rev 1831)
@@ -46,9 +46,9 @@
 #define HOSTCHARS   "-A-Za-z0-9"
 #define USER        "[" USERCHARS "]+(:["PASSCHARS "]+)?"
 #define MATCH_URL1  "^((file|https?|ftps?)://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?" \
-                    "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?$"
+                    "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?/?$"
 #define MATCH_URL2  "^(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?" \
-                    "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?$"
+                    "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?/?$"
 #define MATCH_EMAIL "^(mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+$"