aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@src.gnome.org>2008-06-30 02:15:53 +0800
committerXan Lopez <xan@src.gnome.org>2008-06-30 02:15:53 +0800
commit21608abec6b897869c73009d5ffaf2e4a6a5bf90 (patch)
tree94828edeebb4964936e6fbc0a19926567e86f7fc
parent5aac39ff9672fb14e03ff33b99ab4853955a5592 (diff)
downloadgsoc2013-epiphany-21608abec6b897869c73009d5ffaf2e4a6a5bf90.tar
gsoc2013-epiphany-21608abec6b897869c73009d5ffaf2e4a6a5bf90.tar.gz
gsoc2013-epiphany-21608abec6b897869c73009d5ffaf2e4a6a5bf90.tar.bz2
gsoc2013-epiphany-21608abec6b897869c73009d5ffaf2e4a6a5bf90.tar.lz
gsoc2013-epiphany-21608abec6b897869c73009d5ffaf2e4a6a5bf90.tar.xz
gsoc2013-epiphany-21608abec6b897869c73009d5ffaf2e4a6a5bf90.tar.zst
gsoc2013-epiphany-21608abec6b897869c73009d5ffaf2e4a6a5bf90.zip
embed: remove ephy_embed_go_back.
Use WebKit API directly. svn path=/trunk/; revision=8304
-rw-r--r--doc/reference/epiphany-sections.txt1
-rw-r--r--doc/reference/tmpl/ephy-embed.sgml8
-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/ephy-navigation-action.c6
-rw-r--r--src/epiphany.defs7
7 files changed, 5 insertions, 40 deletions
diff --git a/doc/reference/epiphany-sections.txt b/doc/reference/epiphany-sections.txt
index 30bdf886e..4e58d65a6 100644
--- a/doc/reference/epiphany-sections.txt
+++ b/doc/reference/epiphany-sections.txt
@@ -72,7 +72,6 @@ ephy_embed_can_go_back
ephy_embed_can_go_forward
ephy_embed_can_go_up
ephy_embed_get_go_up_list
-ephy_embed_go_back
ephy_embed_go_forward
ephy_embed_go_up
ephy_embed_shistory_n_items
diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml
index edb06be65..2fa4dbfe5 100644
--- a/doc/reference/tmpl/ephy-embed.sgml
+++ b/doc/reference/tmpl/ephy-embed.sgml
@@ -436,14 +436,6 @@ windows opened with JavaScript often use a nonstandard chrome.
@Returns:
-<!-- ##### FUNCTION ephy_embed_go_back ##### -->
-<para>
-
-</para>
-
-@embed:
-
-
<!-- ##### FUNCTION ephy_embed_go_forward ##### -->
<para>
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index fe543a934..1b12e55e3 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -469,19 +469,6 @@ ephy_embed_get_go_up_list (EphyEmbed *embed)
}
/**
- * ephy_embed_go_back:
- * @embed: an #EphyEmbed
- *
- * Causes @embed to return to the previously-visited web page.
- **/
-void
-ephy_embed_go_back (EphyEmbed *embed)
-{
- EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed);
- iface->go_back (embed);
-}
-
-/**
* ephy_embed_go_forward:
* @embed: an #EphyEmbed
*
diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h
index c5469db26..0fbd42ca9 100644
--- a/embed/ephy-embed.h
+++ b/embed/ephy-embed.h
@@ -174,7 +174,6 @@ struct _EphyEmbedIface
gboolean (* can_go_forward) (EphyEmbed *embed);
gboolean (* can_go_up) (EphyEmbed *embed);
GSList * (* get_go_up_list) (EphyEmbed *embed);
- void (* go_back) (EphyEmbed *embed);
void (* go_forward) (EphyEmbed *embed);
void (* go_up) (EphyEmbed *embed);
const char * (* get_title) (EphyEmbed *embed);
@@ -274,8 +273,6 @@ gboolean ephy_embed_can_go_up (EphyEmbed *embed);
GSList *ephy_embed_get_go_up_list (EphyEmbed *embed);
-void ephy_embed_go_back (EphyEmbed *embed);
-
void ephy_embed_go_forward (EphyEmbed *embed);
void ephy_embed_go_up (EphyEmbed *embed);
diff --git a/embed/webkit/webkit-embed.c b/embed/webkit/webkit-embed.c
index 45d2bfc47..1acd93930 100644
--- a/embed/webkit/webkit-embed.c
+++ b/embed/webkit/webkit-embed.c
@@ -390,12 +390,6 @@ impl_get_go_up_list (EphyEmbed *embed)
}
static void
-impl_go_back (EphyEmbed *embed)
-{
- webkit_web_view_go_back (WEBKIT_EMBED (embed)->priv->web_view);
-}
-
-static void
impl_go_forward (EphyEmbed *embed)
{
webkit_web_view_go_forward (WEBKIT_EMBED (embed)->priv->web_view);
@@ -582,7 +576,6 @@ ephy_embed_iface_init (EphyEmbedIface *iface)
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_back = impl_go_back;
iface->go_forward = impl_go_forward;
iface->go_up = impl_go_up;
iface->get_location = impl_get_location;
diff --git a/src/ephy-navigation-action.c b/src/ephy-navigation-action.c
index e76ac9e2e..d4df0845b 100644
--- a/src/ephy-navigation-action.c
+++ b/src/ephy-navigation-action.c
@@ -29,6 +29,7 @@
#include "ephy-history.h"
#include "ephy-embed-container.h"
#include "ephy-embed-shell.h"
+#include "ephy-embed-utils.h"
#include "ephy-history-item.h"
#include "ephy-link.h"
#include "ephy-gui.h"
@@ -352,10 +353,13 @@ ephy_navigation_action_activate (GtkAction *gtk_action)
EphyNavigationAction *action = EPHY_NAVIGATION_ACTION (gtk_action);
EphyWindow *window = action->priv->window;
EphyEmbed *embed;
+ WebKitWebView *web_view;
embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window));
g_return_if_fail (embed != NULL);
+ web_view = EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed);
+
if (action->priv->direction == EPHY_NAVIGATION_DIRECTION_BACK)
{
if (ephy_gui_is_middle_click ())
@@ -365,7 +369,7 @@ ephy_navigation_action_activate (GtkAction *gtk_action)
NULL,
EPHY_LINK_NEW_TAB);
}
- ephy_embed_go_back (embed);
+ webkit_web_view_go_back (web_view);
}
else if (action->priv->direction == EPHY_NAVIGATION_DIRECTION_FORWARD)
{
diff --git a/src/epiphany.defs b/src/epiphany.defs
index 2c7fa8bc8..bcd74f807 100644
--- a/src/epiphany.defs
+++ b/src/epiphany.defs
@@ -1162,13 +1162,6 @@
(return-type "gboolean")
)
-
-(define-method go_back
- (of-object "EphyEmbed")
- (c-name "ephy_embed_go_back")
- (return-type "none")
-)
-
(define-method go_forward
(of-object "EphyEmbed")
(c-name "ephy_embed_go_forward")