[Gaim-commits] SF.net SVN: gaim: [16182] trunk/src/util.c

[<rl...@us...>]

Revision: 16182
Author:   rlaager
Date:     2006-05-12 14:50:19 -0700 (Fri, 12 May 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16182&view=rev

Log Message:
-----------
SF Patch #1460287 from J?\195?\169r?\195?\180me Poulin (ticpu), with a bug fix by Sadrul

Currently, with a string like "vnc://ticpu.myftp.org:1/", the "ftp.org:1/"
portion will be linkified as an FTP URL.  This patch corrects that.

Modified Paths:
--------------
    trunk/src/util.c
Modified: trunk/src/util.c
===================================================================
--- trunk/src/util.c	2006-05-12 20:21:35 UTC (rev 16181)
+++ trunk/src/util.c	2006-05-12 21:50:19 UTC (rev 16182)
@@ -1837,7 +1837,7 @@
 				t++;
 
 			}
-		} else if (!g_ascii_strncasecmp(c, "www.", 4)) {
+		} else if (!g_ascii_strncasecmp(c, "www.", 4) && (c == text || badchar(c[-1]) || badentity(c-1))) {
 			if (c[4] != '.') {
 				t = c;
 				while (1) {
@@ -1892,7 +1892,7 @@
 				t++;
 
 			}
-		} else if (!g_ascii_strncasecmp(c, "ftp.", 4)) {
+		} else if (!g_ascii_strncasecmp(c, "ftp.", 4) && (c == text || badchar(c[-1]) || badentity(c-1))) {
 			if (c[4] != '.') {
 				t = c;
 				while (1) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.