aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@igalia.com>2012-08-07 23:34:50 +0800
committerXan Lopez <xan@igalia.com>2012-08-07 23:34:50 +0800
commitfcf23c9130758199c6519dbc4e59d49254f4681f (patch)
tree74fbc5641cf4209c89e68445d568e01f1be0bb89
parentec5afea3366a6aed8ba8941fc863d004006eb7d7 (diff)
downloadgsoc2013-epiphany-fcf23c9130758199c6519dbc4e59d49254f4681f.tar
gsoc2013-epiphany-fcf23c9130758199c6519dbc4e59d49254f4681f.tar.gz
gsoc2013-epiphany-fcf23c9130758199c6519dbc4e59d49254f4681f.tar.bz2
gsoc2013-epiphany-fcf23c9130758199c6519dbc4e59d49254f4681f.tar.lz
gsoc2013-epiphany-fcf23c9130758199c6519dbc4e59d49254f4681f.tar.xz
gsoc2013-epiphany-fcf23c9130758199c6519dbc4e59d49254f4681f.tar.zst
gsoc2013-epiphany-fcf23c9130758199c6519dbc4e59d49254f4681f.zip
ephy-web-view: fix URI normalization
Give SoupTLD nothing but the TLD when trying to figure out whether a URI actually has a TLD, otherwise it won't be happy. In particular: '.gnome.org' -> Not OK '.org' -> OK Add a test for this case.
-rw-r--r--embed/ephy-web-view.c2
-rw-r--r--tests/ephy-web-view-test.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 3ee698bc5..d8e5c7a00 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -2833,7 +2833,7 @@ is_public_domain (EphyWebView *view, const char *url)
if (g_str_equal (url, "localhost"))
return TRUE;
- url = g_strstr_len (url, -1, ".");
+ url = g_strrstr (url, ".");
if (!url || *url == '\0')
return FALSE;
diff --git a/tests/ephy-web-view-test.c b/tests/ephy-web-view-test.c
index 32a86db8d..f2cedb51d 100644
--- a/tests/ephy-web-view-test.c
+++ b/tests/ephy-web-view-test.c
@@ -287,7 +287,8 @@ static struct {
{ "lala.lala", "http://www.google.com/search?q=lala%2Elala&ie=UTF-8&oe=UTF-8" },
{ "127.0.0.1", "http://127.0.0.1" },
{ "http://127.0.0.1", "http://127.0.0.1" },
- { "totalgarbage0xdeadbeef", "http://www.google.com/search?q=totalgarbage0xdeadbeef&ie=UTF-8&oe=UTF-8" }
+ { "totalgarbage0xdeadbeef", "http://www.google.com/search?q=totalgarbage0xdeadbeef&ie=UTF-8&oe=UTF-8" },
+ { "planet.gnome.org", "http://planet.gnome.org" }
};
static void