From 83c145ca0bdf9c659f808a1485ad2f580c6b439f Mon Sep 17 00:00:00 2001 From: Xan Lopez Date: Sun, 29 Jun 2008 18:16:03 +0000 Subject: embed: remove ephy_embed_can_go_forward. Use WebKit API directly. svn path=/trunk/; revision=8306 --- embed/ephy-base-embed.c | 3 ++- embed/ephy-embed.c | 13 ------------- embed/ephy-embed.h | 3 --- embed/webkit/webkit-embed.c | 7 ------- 4 files changed, 2 insertions(+), 24 deletions(-) (limited to 'embed') 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 @@ -418,19 +418,6 @@ ephy_embed_can_go_back (EphyEmbed *embed) return iface->can_go_back (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 @@ -371,12 +371,6 @@ impl_can_go_back (EphyEmbed *embed) return webkit_web_view_can_go_back (WEBKIT_EMBED (embed)->priv->web_view); } -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) { @@ -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; -- cgit v1.2.3