aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-11-02 17:05:28 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-11-02 17:05:28 +0800
commitdff6d4ec7292db208dac8abf44a238764b1e3915 (patch)
treecc269c693bd68d311f2a3e08e6177d7ca766161a
parentb77668866f1d5cc4fed07786c659380c8e95e1e5 (diff)
parent6f6c118815634fa3ddbd62df46e7447341a81f5b (diff)
downloadgsoc2013-empathy-dff6d4ec7292db208dac8abf44a238764b1e3915.tar
gsoc2013-empathy-dff6d4ec7292db208dac8abf44a238764b1e3915.tar.gz
gsoc2013-empathy-dff6d4ec7292db208dac8abf44a238764b1e3915.tar.bz2
gsoc2013-empathy-dff6d4ec7292db208dac8abf44a238764b1e3915.tar.lz
gsoc2013-empathy-dff6d4ec7292db208dac8abf44a238764b1e3915.tar.xz
gsoc2013-empathy-dff6d4ec7292db208dac8abf44a238764b1e3915.tar.zst
gsoc2013-empathy-dff6d4ec7292db208dac8abf44a238764b1e3915.zip
Merge remote branch 'vminko/fix-609942'
-rw-r--r--libempathy-gtk/empathy-string-parser.c12
-rw-r--r--tests/empathy-parser-test.c6
2 files changed, 11 insertions, 7 deletions
diff --git a/libempathy-gtk/empathy-string-parser.c b/libempathy-gtk/empathy-string-parser.c
index 45ae6a720..3bb6a82be 100644
--- a/libempathy-gtk/empathy-string-parser.c
+++ b/libempathy-gtk/empathy-string-parser.c
@@ -27,14 +27,14 @@
#include "empathy-ui-utils.h"
#define SCHEMES "([a-zA-Z\\+]+)"
-#define INVALID_CHARS "\\s\"'"
-#define INVALID_CHARS_EXT INVALID_CHARS "\\[\\]<>(){},;:?"
-#define BODY "([^"INVALID_CHARS"]+)"
-#define BODY_END "([^"INVALID_CHARS"]*)[^"INVALID_CHARS_EXT".]"
-#define BODY_STRICT "([^"INVALID_CHARS_EXT"]+)"
+#define INVALID_CHARS "\\s\"<>"
+#define INVALID_CHARS_EXT INVALID_CHARS "\\[\\](){},;:"
+#define INVALID_CHARS_FULL INVALID_CHARS_EXT "?'"
+#define BODY "([^"INVALID_CHARS_FULL"])([^"INVALID_CHARS_EXT"]*)"
+#define BODY_END "([^"INVALID_CHARS"]*)[^"INVALID_CHARS_FULL".]"
#define URI_REGEX "("SCHEMES"://"BODY_END")" \
"|((www|ftp)\\."BODY_END")" \
- "|((mailto:)?"BODY_STRICT"@"BODY"\\."BODY_END")"
+ "|((mailto:)?"BODY"@"BODY"\\."BODY_END")"
static GRegex *
uri_regex_dup_singleton (void)
diff --git a/tests/empathy-parser-test.c b/tests/empathy-parser-test.c
index 5713d967c..a79a7a287 100644
--- a/tests/empathy-parser-test.c
+++ b/tests/empathy-parser-test.c
@@ -44,6 +44,8 @@ test_parsers (void)
"http://foo.com; bar", "[http://foo.com]; bar",
"http://foo.com: bar", "[http://foo.com]: bar",
"http://foo.com:bar", "[http://foo.com:bar]",
+ "http://apos'foo.com", "[http://apos'foo.com]",
+ "mailto:bar'?user@server.com", "[mailto:bar'?user@server.com]",
/* They are not links! */
"http://", "http[:/]/", /* Hm... */
@@ -54,7 +56,7 @@ test_parsers (void)
"mailto:user@.com", "mailto:user@.com",
"user@.com", "user@.com",
- /* Links inside (), {}, [], <> or "" */
+ /* Links inside (), {}, [], <>, "" or '' */
/* FIXME: How to test if the ending ] is matched or not? */
"Foo (www.foo.com)", "Foo ([www.foo.com])",
"Foo {www.foo.com}", "Foo {[www.foo.com]}",
@@ -68,6 +70,8 @@ test_parsers (void)
"Foo [user@server.com]", "Foo [[user@server.com]]",
"Foo <user@server.com>", "Foo &lt;[user@server.com]&gt;",
"Foo \"user@server.com\"", "Foo &quot;[user@server.com]&quot;",
+ "<a href='http://apos'foo.com'>bar</a>", "&lt;a href=&apos;[http://apos'foo.com]&apos;&gt;bar&lt;/a&gt;",
+ "Foo 'bar'?user@server.com'", "Foo &apos;[bar'?user@server.com]&apos;",
/* Basic smileys */
"a:)b", "a[:)]b",