# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1147470619 0
# Node ID 9df4a46b0bb328c7fd80191ac96b6bdd1cebb0b2
# Parent  1afc1b0c4fb32a46adba0e8abcac387173b4a0c8
[gaim-migrate @ 16182]
SF Patch #1460287 from J���r���me 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.

committer: Tailor Script <tailor@pidgin.im>

diff -r 1afc1b0c4fb3 -r 9df4a46b0bb3 src/util.c
--- a/src/util.c	Fri May 12 20:21:35 2006 +0000
+++ b/src/util.c	Fri May 12 21:50:19 2006 +0000
@@ -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) {