diff options
| -rw-r--r-- | doc/reference/epiphany-sections.txt | 1 | ||||
| -rw-r--r-- | doc/reference/tmpl/ephy-embed.sgml | 9 | ||||
| -rw-r--r-- | embed/ephy-base-embed.c | 2 | ||||
| -rw-r--r-- | embed/ephy-embed.c | 13 | ||||
| -rw-r--r-- | embed/ephy-embed.h | 3 | ||||
| -rw-r--r-- | embed/webkit/webkit-embed.c | 7 | ||||
| -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 45630cd40..ea440e83b 100644 --- a/doc/reference/epiphany-sections.txt +++ b/doc/reference/epiphany-sections.txt @@ -68,7 +68,6 @@ ephy_embed_get_title ephy_embed_get_location ephy_embed_get_link_message ephy_embed_get_js_status -ephy_embed_can_go_back 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 1573b86b1..25910945e 100644 --- a/doc/reference/tmpl/ephy-embed.sgml +++ b/doc/reference/tmpl/ephy-embed.sgml @@ -399,15 +399,6 @@ windows opened with JavaScript often use a nonstandard chrome. @Returns: -<!-- ##### FUNCTION ephy_embed_can_go_back ##### --> -<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 a5411b6bc..ec4412857 100644 --- a/embed/ephy-base-embed.c +++ b/embed/ephy-base-embed.c @@ -1112,7 +1112,7 @@ update_navigation_flags (EphyBaseEmbed *membed) flags |= EPHY_EMBED_NAV_UP; } - if (ephy_embed_can_go_back (embed)) { + if (webkit_web_view_can_go_back (web_view)) { flags |= EPHY_EMBED_NAV_BACK; } diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c index 086c19bd8..f6bc66987 100644 --- a/embed/ephy-embed.c +++ b/embed/ephy-embed.c @@ -406,19 +406,6 @@ ephy_embed_load (EphyEmbed *embed, } /** - * ephy_embed_can_go_back: - * @embed: an #EphyEmbed - * - * Return value: %TRUE if @embed can return to a previously-visited location - **/ -gboolean -ephy_embed_can_go_back (EphyEmbed *embed) -{ - EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); - return iface->can_go_back (embed); -} - -/** * ephy_embed_can_go_up: * @embed: an #EphyEmbed * diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h index 155975774..2dddb985d 100644 --- a/embed/ephy-embed.h +++ b/embed/ephy-embed.h @@ -170,7 +170,6 @@ struct _EphyEmbedIface const char *url, EphyEmbedLoadFlags flags, EphyEmbed *referring_embed); - gboolean (* can_go_back) (EphyEmbed *embed); gboolean (* can_go_up) (EphyEmbed *embed); GSList * (* get_go_up_list) (EphyEmbed *embed); void (* go_up) (EphyEmbed *embed); @@ -263,8 +262,6 @@ const char *ephy_embed_get_link_message (EphyEmbed *embed); char *ephy_embed_get_js_status (EphyEmbed *embed); /* Navigation */ -gboolean ephy_embed_can_go_back (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 69de6221d..304273412 100644 --- a/embed/webkit/webkit-embed.c +++ b/embed/webkit/webkit-embed.c @@ -366,12 +366,6 @@ impl_load (EphyEmbed *embed, } static gboolean -impl_can_go_back (EphyEmbed *embed) -{ - return webkit_web_view_can_go_back (WEBKIT_EMBED (embed)->priv->web_view); -} - -static gboolean impl_can_go_up (EphyEmbed *embed) { return FALSE; @@ -560,7 +554,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_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 351546229..b4b1da526 100644 --- a/src/epiphany.defs +++ b/src/epiphany.defs @@ -1144,12 +1144,6 @@ (return-type "char*") ) -(define-method can_go_back - (of-object "EphyEmbed") - (c-name "ephy_embed_can_go_back") - (return-type "gboolean") -) - (define-method can_go_up (of-object "EphyEmbed") (c-name "ephy_embed_can_go_up") |