[Xfce4-commits] r23613 - in libexo/trunk: . exo

[Benedikt Meurer]

Author: benny
Date: 2006-11-03 18:27:31 +0000 (Fri, 03 Nov 2006)
New Revision: 23613

Modified:
   libexo/trunk/ChangeLog
   libexo/trunk/exo/exo-url.c
Log:
2006-11-03	Benedikt Meurer <benny at xfce.org>

	* exo/exo-url.c: Underscore is a valid character for usernames.
	  Bug #2453.




Modified: libexo/trunk/ChangeLog
===================================================================
--- libexo/trunk/ChangeLog	2006-11-03 16:28:03 UTC (rev 23612)
+++ libexo/trunk/ChangeLog	2006-11-03 18:27:31 UTC (rev 23613)
@@ -1,5 +1,10 @@
 2006-11-03	Benedikt Meurer <benny at xfce.org>
 
+	* exo/exo-url.c: Underscore is a valid character for usernames.
+	  Bug #2453.
+
+2006-11-03	Benedikt Meurer <benny at xfce.org>
+
 	* exo/exo-cell-renderer-icon.c(exo_cell_renderer_icon_render): Handle
 	  internal icons properly. Bug #2488.
 

Modified: libexo/trunk/exo/exo-url.c
===================================================================
--- libexo/trunk/exo/exo-url.c	2006-11-03 16:28:03 UTC (rev 23612)
+++ libexo/trunk/exo/exo-url.c	2006-11-03 18:27:31 UTC (rev 23613)
@@ -61,9 +61,9 @@
 #define MATCH_BROWSER2  "(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?" \
                         "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?"
 #if !defined(__GLIBC__)
-#define MATCH_MAILER    "(mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+"
+#define MATCH_MAILER    "(mailto:)?[a-z0-9][a-z0-9_.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+"
 #else
-#define MATCH_MAILER    "\\<(mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>"
+#define MATCH_MAILER    "\\<(mailto:)?[a-z0-9][a-z0-9_.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>"
 #endif