epiphany r8306 - in trunk: doc/reference doc/reference/tmpl embed embed/webkit src

[xan svn gnome org]

Author: xan
Date: Sun Jun 29 18:16:03 2008
New Revision: 8306
URL: http://svn.gnome.org/viewvc/epiphany?rev=8306&view=rev

Log:
embed: remove ephy_embed_can_go_forward.

Use WebKit API directly.


Modified:
   trunk/doc/reference/epiphany-sections.txt
   trunk/doc/reference/tmpl/ephy-embed.sgml
   trunk/embed/ephy-base-embed.c
   trunk/embed/ephy-embed.c
   trunk/embed/ephy-embed.h
   trunk/embed/webkit/webkit-embed.c
   trunk/src/epiphany.defs

Modified: trunk/doc/reference/epiphany-sections.txt
==============================================================================
--- trunk/doc/reference/epiphany-sections.txt	(original)
+++ trunk/doc/reference/epiphany-sections.txt	Sun Jun 29 18:16:03 2008
@@ -69,7 +69,6 @@
 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

Modified: trunk/doc/reference/tmpl/ephy-embed.sgml
==============================================================================
--- trunk/doc/reference/tmpl/ephy-embed.sgml	(original)
+++ trunk/doc/reference/tmpl/ephy-embed.sgml	Sun Jun 29 18:16:03 2008
@@ -293,7 +293,6 @@
 @load: 
 @reload: 
 @can_go_back: 
- can_go_forward: 
 @can_go_up: 
 @get_go_up_list: 
 @go_back: 
@@ -409,15 +408,6 @@
 @Returns: 
 
 
-<!-- ##### FUNCTION ephy_embed_can_go_forward ##### -->
-<para>
-
-</para>
-
- embed: 
- Returns: 
-
-
 <!-- ##### FUNCTION ephy_embed_can_go_up ##### -->
 <para>
 

Modified: trunk/embed/ephy-base-embed.c
==============================================================================
--- trunk/embed/ephy-base-embed.c	(original)
+++ trunk/embed/ephy-base-embed.c	Sun Jun 29 18:16:03 2008
@@ -1106,6 +1106,7 @@
   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 @@
     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;
   }
 

Modified: trunk/embed/ephy-embed.c
==============================================================================
--- trunk/embed/ephy-embed.c	(original)
+++ trunk/embed/ephy-embed.c	Sun Jun 29 18:16:03 2008
@@ -419,19 +419,6 @@
 }
 
 /**
- * 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
  *

Modified: trunk/embed/ephy-embed.h
==============================================================================
--- trunk/embed/ephy-embed.h	(original)
+++ trunk/embed/ephy-embed.h	Sun Jun 29 18:16:03 2008
@@ -171,7 +171,6 @@
 							   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 @@
 /* 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);

Modified: trunk/embed/webkit/webkit-embed.c
==============================================================================
--- trunk/embed/webkit/webkit-embed.c	(original)
+++ trunk/embed/webkit/webkit-embed.c	Sun Jun 29 18:16:03 2008
@@ -372,12 +372,6 @@
 }
 
 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 @@
   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;

Modified: trunk/src/epiphany.defs
==============================================================================
--- trunk/src/epiphany.defs	(original)
+++ trunk/src/epiphany.defs	Sun Jun 29 18:16:03 2008
@@ -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")