aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@src.gnome.org>2007-11-06 03:55:27 +0800
committerXan Lopez <xan@src.gnome.org>2007-11-06 03:55:27 +0800
commit85b31a5071cc3e9fe50324e2ec81cc01fcf75c66 (patch)
treec22f16113c48928e4bfd82d6a4401ae070a8d3b6
parente536dd57924f9f0af06ebd5650bc8313d90aeed2 (diff)
downloadgsoc2013-epiphany-85b31a5071cc3e9fe50324e2ec81cc01fcf75c66.tar
gsoc2013-epiphany-85b31a5071cc3e9fe50324e2ec81cc01fcf75c66.tar.gz
gsoc2013-epiphany-85b31a5071cc3e9fe50324e2ec81cc01fcf75c66.tar.bz2
gsoc2013-epiphany-85b31a5071cc3e9fe50324e2ec81cc01fcf75c66.tar.lz
gsoc2013-epiphany-85b31a5071cc3e9fe50324e2ec81cc01fcf75c66.tar.xz
gsoc2013-epiphany-85b31a5071cc3e9fe50324e2ec81cc01fcf75c66.tar.zst
gsoc2013-epiphany-85b31a5071cc3e9fe50324e2ec81cc01fcf75c66.zip
Use ephy_embed_utils_address_has_web_scheme instead of our own copy.
svn path=/trunk/; revision=7632
-rw-r--r--embed/ephy-base-embed.c22
1 files changed, 2 insertions, 20 deletions
diff --git a/embed/ephy-base-embed.c b/embed/ephy-base-embed.c
index d57ac9b11..11b5ac345 100644
--- a/embed/ephy-base-embed.c
+++ b/embed/ephy-base-embed.c
@@ -518,24 +518,6 @@ ge_document_type_cb (EphyEmbed *embed,
}
}
-static gboolean
-address_has_web_scheme (const char *address)
-{
- gboolean has_web_scheme;
-
- if (address == NULL) return FALSE;
-
- has_web_scheme = (g_str_has_prefix (address, "http:") ||
- g_str_has_prefix (address, "https:") ||
- g_str_has_prefix (address, "ftp:") ||
- g_str_has_prefix (address, "file:") ||
- g_str_has_prefix (address, "data:") ||
- g_str_has_prefix (address, "about:") ||
- g_str_has_prefix (address, "gopher:"));
-
- return has_web_scheme;
-}
-
static void
ge_zoom_change_cb (EphyEmbed *embed,
float zoom,
@@ -549,7 +531,7 @@ ge_zoom_change_cb (EphyEmbed *embed,
}
address = ephy_embed_get_location (embed, TRUE);
- if (address_has_web_scheme (address)) {
+ if (ephy_embed_utils_address_has_web_scheme (address)) {
EphyHistory *history;
EphyNode *host;
history = EPHY_HISTORY
@@ -1242,7 +1224,7 @@ ephy_base_embed_restore_zoom_level (EphyBaseEmbed *membed,
EphyBaseEmbedPrivate *priv = membed->priv;
/* restore zoom level */
- if (address_has_web_scheme (address)) {
+ if (ephy_embed_utils_address_has_web_scheme (address)) {
EphyHistory *history;
EphyNode *host;
GValue value = { 0, };