diff options
author | Xan Lopez <xan@src.gnome.org> | 2008-06-30 02:15:58 +0800 |
---|---|---|
committer | Xan Lopez <xan@src.gnome.org> | 2008-06-30 02:15:58 +0800 |
commit | 3c310a6753141eb1a01acdacc3d2286080183d0f (patch) | |
tree | 5036770a58801aef362136ae893fcb7cd0151f7f | |
parent | 21608abec6b897869c73009d5ffaf2e4a6a5bf90 (diff) | |
download | gsoc2013-epiphany-3c310a6753141eb1a01acdacc3d2286080183d0f.tar gsoc2013-epiphany-3c310a6753141eb1a01acdacc3d2286080183d0f.tar.gz gsoc2013-epiphany-3c310a6753141eb1a01acdacc3d2286080183d0f.tar.bz2 gsoc2013-epiphany-3c310a6753141eb1a01acdacc3d2286080183d0f.tar.lz gsoc2013-epiphany-3c310a6753141eb1a01acdacc3d2286080183d0f.tar.xz gsoc2013-epiphany-3c310a6753141eb1a01acdacc3d2286080183d0f.tar.zst gsoc2013-epiphany-3c310a6753141eb1a01acdacc3d2286080183d0f.zip |
embed: remove ephy_embed_go_forward.
Use WebKit API directly.
svn path=/trunk/; revision=8305
-rw-r--r-- | doc/reference/epiphany-sections.txt | 1 | ||||
-rw-r--r-- | doc/reference/tmpl/ephy-embed.sgml | 8 | ||||
-rw-r--r-- | embed/ephy-embed.c | 14 | ||||
-rw-r--r-- | embed/ephy-embed.h | 3 | ||||
-rw-r--r-- | embed/webkit/webkit-embed.c | 7 | ||||
-rw-r--r-- | src/ephy-navigation-action.c | 2 | ||||
-rw-r--r-- | src/epiphany.defs | 6 |
7 files changed, 1 insertions, 40 deletions
diff --git a/doc/reference/epiphany-sections.txt b/doc/reference/epiphany-sections.txt index 4e58d65a6..d0ea3c828 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_forward ephy_embed_go_up ephy_embed_shistory_n_items ephy_embed_shistory_get_nth diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml index 2fa4dbfe5..280af6f25 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_forward ##### --> -<para> - -</para> - -@embed: - - <!-- ##### FUNCTION ephy_embed_go_up ##### --> <para> diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c index 1b12e55e3..e01d057b9 100644 --- a/embed/ephy-embed.c +++ b/embed/ephy-embed.c @@ -469,20 +469,6 @@ ephy_embed_get_go_up_list (EphyEmbed *embed) } /** - * ephy_embed_go_forward: - * @embed: an #EphyEmbed - * - * If @embed has returned to a previously-visited web page, proceed forward to - * the next page. - **/ -void -ephy_embed_go_forward (EphyEmbed *embed) -{ - EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); - iface->go_forward (embed); -} - -/** * ephy_embed_go_up: * @embed: an #EphyEmbed * diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h index 0fbd42ca9..7c0a3461f 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_forward) (EphyEmbed *embed); void (* go_up) (EphyEmbed *embed); const char * (* get_title) (EphyEmbed *embed); char * (* get_location) (EphyEmbed *embed, @@ -273,8 +272,6 @@ gboolean ephy_embed_can_go_up (EphyEmbed *embed); GSList *ephy_embed_get_go_up_list (EphyEmbed *embed); -void ephy_embed_go_forward (EphyEmbed *embed); - void ephy_embed_go_up (EphyEmbed *embed); void ephy_embed_shistory_copy (EphyEmbed *source, diff --git a/embed/webkit/webkit-embed.c b/embed/webkit/webkit-embed.c index 1acd93930..b9728c59a 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_forward (EphyEmbed *embed) -{ - webkit_web_view_go_forward (WEBKIT_EMBED (embed)->priv->web_view); -} - -static void impl_go_up (EphyEmbed *embed) { } @@ -576,7 +570,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_forward = impl_go_forward; iface->go_up = impl_go_up; iface->get_location = impl_get_location; iface->get_js_status = impl_get_js_status; diff --git a/src/ephy-navigation-action.c b/src/ephy-navigation-action.c index d4df0845b..7677f8598 100644 --- a/src/ephy-navigation-action.c +++ b/src/ephy-navigation-action.c @@ -380,7 +380,7 @@ ephy_navigation_action_activate (GtkAction *gtk_action) NULL, EPHY_LINK_NEW_TAB); } - ephy_embed_go_forward (embed); + webkit_web_view_go_forward (web_view); } else if (action->priv->direction == EPHY_NAVIGATION_DIRECTION_UP) { diff --git a/src/epiphany.defs b/src/epiphany.defs index bcd74f807..0d4a9793e 100644 --- a/src/epiphany.defs +++ b/src/epiphany.defs @@ -1162,12 +1162,6 @@ (return-type "gboolean") ) -(define-method go_forward - (of-object "EphyEmbed") - (c-name "ephy_embed_go_forward") - (return-type "none") -) - (define-method go_up (of-object "EphyEmbed") (c-name "ephy_embed_go_up") |