empathy r1957 - trunk/libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Wed Dec 10 10:13:51 2008
New Revision: 1957
URL: http://svn.gnome.org/viewvc/empathy?rev=1957&view=rev

Log:
Clarify 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	Wed Dec 10 10:13:51 2008
@@ -36,11 +36,11 @@
 
 #define SCHEMES "(https?|ftps?|nntp|news|javascript|about|ghelp|apt|telnet|"\
 		"file|webcal|mailto)"
-#define SEPARATOR "([^,;\?><()\\ \"\\.])"
 #define BODY "([^\\ ]+)"
-#define URI_REGEX "("SCHEMES"://"BODY SEPARATOR")" \
-		  "|((mailto:)?"BODY"@"BODY"\\."BODY SEPARATOR")"\
-		  "|((www|ftp)\\."BODY SEPARATOR")"
+#define END_BODY "([^\\ ]*[^,;\?><()\\ \"\\.])"
+#define URI_REGEX "("SCHEMES"://"END_BODY")" \
+		  "|((mailto:)?"BODY"@"BODY"\\."END_BODY")"\
+		  "|((www|ftp)\\."END_BODY")"
 static GRegex *uri_regex = NULL;
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyTheme)