empathy r1956 - trunk/libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Tue Dec  9 16:19:44 2008
New Revision: 1956
URL: http://svn.gnome.org/viewvc/empathy?rev=1956&view=rev

Log:
Improve URI regex.

Modified:
   trunk/libempathy-gtk/empathy-theme.c

Modified: trunk/libempathy-gtk/empathy-theme.c
==============================================================================
--- trunk/libempathy-gtk/empathy-theme.c	(original)
+++ trunk/libempathy-gtk/empathy-theme.c	Tue Dec  9 16:19:44 2008
@@ -35,12 +35,12 @@
 #define TIMESTAMP_INTERVAL 300
 
 #define SCHEMES "(https?|ftps?|nntp|news|javascript|about|ghelp|apt|telnet|"\
-	       "file|webcal|mailto)"
-#define SEPARATOR "([^,;\?><()\\ ])"
-#define BODY "([^\\ ]*(\\\\ )?)+"
+		"file|webcal|mailto)"
+#define SEPARATOR "([^,;\?><()\\ \"\\.])"
+#define BODY "([^\\ ]+)"
 #define URI_REGEX "("SCHEMES"://"BODY SEPARATOR")" \
 		  "|((mailto:)?"BODY"@"BODY"\\."BODY SEPARATOR")"\
-		  "|((www|ftp)."BODY SEPARATOR")"
+		  "|((www|ftp)\\."BODY SEPARATOR")"
 static GRegex *uri_regex = NULL;
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyTheme)