changeset
[gaim-migrate @ 16182]
Fri, 12 May 2006 21:50:19 +0000
- author
- Jérôme Poulin <ticpu@users.sourceforge.net>
- date
- Fri, 12 May 2006 21:50:19 +0000
- changeset 13772
- f4c5bc2d6b71
- parent 13771
- 83a308e6d49f
- child 13773
- 7682714bab8c
[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: Richard Laager <rlaager@pidgin.im>
| src/util.c | file | annotate | diff | comparison | revisions |
--- 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) {
