aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@src.gnome.org>2008-06-30 02:16:03 +0800
committerXan Lopez <xan@src.gnome.org>2008-06-30 02:16:03 +0800
commit83c145ca0bdf9c659f808a1485ad2f580c6b439f (patch)
tree7426741deeb238f64842250f7c8afe14c788f994
parent3c310a6753141eb1a01acdacc3d2286080183d0f (diff)
downloadgsoc2013-epiphany-83c145ca0bdf9c659f808a1485ad2f580c6b439f.tar
gsoc2013-epiphany-83c145ca0bdf9c659f808a1485ad2f580c6b439f.tar.gz
gsoc2013-epiphany-83c145ca0bdf9c659f808a1485ad2f580c6b439f.tar.bz2
gsoc2013-epiphany-83c145ca0bdf9c659f808a1485ad2f580c6b439f.tar.lz
gsoc2013-epiphany-83c145ca0bdf9c659f808a1485ad2f580c6b439f.tar.xz
gsoc2013-epiphany-83c145ca0bdf9c659f808a1485ad2f580c6b439f.tar.zst
gsoc2013-epiphany-83c145ca0bdf9c659f808a1485ad2f580c6b439f.zip
embed: remove ephy_embed_can_go_forward.
Use WebKit API directly. svn path=/trunk/; revision=8306
-rw-r--r--doc/reference/epiphany-sections.txt1
-rw-r--r--doc/reference/tmpl/ephy-embed.sgml10
-rw-r--r--embed/ephy-base-embed.c3
-rw-r--r--embed/ephy-embed.c13
-rw-r--r--embed/ephy-embed.h3
-rw-r--r--embed/webkit/webkit-embed.c7
-rw-r--r--src/epiphany.defs6
7 files changed, 2 insertions, 41 deletions
diff --git a/doc/reference/epiphany-sections.txt b/doc/reference/epiphany-sections.txt
index d0ea3c828..45630cd40 100644
--- a/doc/reference/epiphany-sections.txt
+++ b/doc/reference/epiphany-sections.txt
@@ -69,7 +69,6 @@ ephy_embed_get_location
ephy_embed_get_link_message
ephy_embed_get_js_status
ephy_embed_can_go_back
-ephy_embed_can_go_forward
ephy_embed_can_go_up
ephy_embed_get_go_up_list
ephy_embed_go_up
diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml
index 280af6f25..1573b86b1 100644
--- a/doc/reference/tmpl/ephy-embed.sgml
+++ b/doc/reference/tmpl/ephy-embed.sgml
@@ -293,7 +293,6 @@ be done by casting).
@load:
@reload:
@can_go_back:
-@can_go_forward:
@can_go_up:
@get_go_up_list:
@go_back:
@@ -409,15 +408,6 @@ windows opened with JavaScript often use a nonstandard chrome.
@Returns:
-<!-- ##### FUNCTION ephy_embed_can_go_forward ##### -->
-<para>
-
-</para>
-
-@embed:
-@Returns:
-
-
<!-- ##### FUNCTION ephy_embed_can_go_up ##### -->
<para>
diff --git a/embed/ephy-base-embed.c b/embed/ephy-base-embed.c
index 28a64008f..a5411b6bc 100644
--- a/embed/ephy-base-embed.c
+++ b/embed/ephy-base-embed.c
@@ -1106,6 +1106,7 @@ update_navigation_flags (EphyBaseEmbed *membed)
EphyBaseEmbedPrivate *priv = membed->priv;
EphyEmbed *embed = EPHY_EMBED (membed);
guint flags = 0;
+ WebKitWebView *web_view = EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed);
if (ephy_embed_can_go_up (embed)) {
flags |= EPHY_EMBED_NAV_UP;
@@ -1115,7 +1116,7 @@ update_navigation_flags (EphyBaseEmbed *membed)
flags |= EPHY_EMBED_NAV_BACK;
}
- if (ephy_embed_can_go_forward (embed)) {
+ if (webkit_web_view_can_go_forward (web_view)) {
flags |= EPHY_EMBED_NAV_FORWARD;
}
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index e01d057b9..086c19bd8 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -419,19 +419,6 @@ ephy_embed_can_go_back (EphyEmbed *embed)
}
/**
- * ephy_embed_can_go_forward:
- * @embed: an #EphyEmbed
- *
- * Return value: %TRUE if @embed has gone back, and can thus go forward again
- **/
-gboolean
-ephy_embed_can_go_forward (EphyEmbed *embed)
-{
- EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed);
- return iface->can_go_forward (embed);
-}
-
-/**
* ephy_embed_can_go_up:
* @embed: an #EphyEmbed
*
diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h
index 7c0a3461f..155975774 100644
--- a/embed/ephy-embed.h
+++ b/embed/ephy-embed.h
@@ -171,7 +171,6 @@ struct _EphyEmbedIface
EphyEmbedLoadFlags flags,
EphyEmbed *referring_embed);
gboolean (* can_go_back) (EphyEmbed *embed);
- gboolean (* can_go_forward) (EphyEmbed *embed);
gboolean (* can_go_up) (EphyEmbed *embed);
GSList * (* get_go_up_list) (EphyEmbed *embed);
void (* go_up) (EphyEmbed *embed);
@@ -266,8 +265,6 @@ char *ephy_embed_get_js_status (EphyEmbed *embed);
/* Navigation */
gboolean ephy_embed_can_go_back (EphyEmbed *embed);
-gboolean ephy_embed_can_go_forward (EphyEmbed *embed);
-
gboolean ephy_embed_can_go_up (EphyEmbed *embed);
GSList *ephy_embed_get_go_up_list (EphyEmbed *embed);
diff --git a/embed/webkit/webkit-embed.c b/embed/webkit/webkit-embed.c
index b9728c59a..69de6221d 100644
--- a/embed/webkit/webkit-embed.c
+++ b/embed/webkit/webkit-embed.c
@@ -372,12 +372,6 @@ impl_can_go_back (EphyEmbed *embed)
}
static gboolean
-impl_can_go_forward (EphyEmbed *embed)
-{
- return webkit_web_view_can_go_forward (WEBKIT_EMBED (embed)->priv->web_view);
-}
-
-static gboolean
impl_can_go_up (EphyEmbed *embed)
{
return FALSE;
@@ -567,7 +561,6 @@ ephy_embed_iface_init (EphyEmbedIface *iface)
iface->load_url = impl_load_url;
iface->load = impl_load;
iface->can_go_back = impl_can_go_back;
- iface->can_go_forward =impl_can_go_forward;
iface->can_go_up = impl_can_go_up;
iface->get_go_up_list = impl_get_go_up_list;
iface->go_up = impl_go_up;
diff --git a/src/epiphany.defs b/src/epiphany.defs
index 0d4a9793e..351546229 100644
--- a/src/epiphany.defs
+++ b/src/epiphany.defs
@@ -1150,12 +1150,6 @@
(return-type "gboolean")
)
-(define-method can_go_forward
- (of-object "EphyEmbed")
- (c-name "ephy_embed_can_go_forward")
- (return-type "gboolean")
-)
-
(define-method can_go_up
(of-object "EphyEmbed")
(c-name "ephy_embed_can_go_up")