aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorXan Lopez <xan@gnome.org>2009-05-29 00:16:39 +0800
committerXan Lopez <xan@gnome.org>2009-05-29 00:16:39 +0800
commit4916b8718e065e37e45f5609ef1061f894fc71a0 (patch)
tree391f96c6d58a7e718aa0b83cfc3c7377a3280fba /embed
parent1a38edaef1a0f89e3964c82d321d9fd7db7dc6bf (diff)
downloadgsoc2013-epiphany-4916b8718e065e37e45f5609ef1061f894fc71a0.tar
gsoc2013-epiphany-4916b8718e065e37e45f5609ef1061f894fc71a0.tar.gz
gsoc2013-epiphany-4916b8718e065e37e45f5609ef1061f894fc71a0.tar.bz2
gsoc2013-epiphany-4916b8718e065e37e45f5609ef1061f894fc71a0.tar.lz
gsoc2013-epiphany-4916b8718e065e37e45f5609ef1061f894fc71a0.tar.xz
gsoc2013-epiphany-4916b8718e065e37e45f5609ef1061f894fc71a0.tar.zst
gsoc2013-epiphany-4916b8718e065e37e45f5609ef1061f894fc71a0.zip
webkit-embed.c: do not reinvent ephy-embed-utils functions.
Diffstat (limited to 'embed')
-rw-r--r--embed/webkit/webkit-embed.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/embed/webkit/webkit-embed.c b/embed/webkit/webkit-embed.c
index 1323322be..66da62f32 100644
--- a/embed/webkit/webkit-embed.c
+++ b/embed/webkit/webkit-embed.c
@@ -796,16 +796,8 @@ impl_load (EphyEmbed *embed,
WebKitEmbed *wembed = WEBKIT_EMBED (embed);
char *effective_url = NULL;
- /* FIXME: WebKit has some strange bug for which there must be
- * protocol prefix into the parsed URL, or it will not show images
- * and lock badly. I copied this function from WebKit's
- * GdkLauncher.
- */
- if (strncmp ("about:", url, 6) != 0 &&
- strncmp ("http://", url, 7) != 0 &&
- strncmp ("https://", url, 8) != 0 &&
- strncmp ("file://", url, 7) != 0 &&
- strncmp ("ftp://", url, 6) != 0)
+ /* WebKit cannot handle URLs without a protocol */
+ if (ephy_embed_utils_address_has_web_scheme (url) == FALSE)
effective_url = g_strconcat ("http://", url, NULL);
else
effective_url = g_strdup (url);