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



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

Log:
embed: remove ephy_embed_can_go_back.

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:08 2008
@@ -68,7 +68,6 @@
 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

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:08 2008
@@ -399,15 +399,6 @@
 @Returns: 
 
 
-<!-- ##### FUNCTION ephy_embed_can_go_back ##### -->
-<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:08 2008
@@ -1112,7 +1112,7 @@
     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;
   }
 

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

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

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:08 2008
@@ -366,12 +366,6 @@
 }
 
 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 @@
 {
   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;

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



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]