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

[xan svn gnome org]

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

Log:
embed: remove ephy_embed_go_back.

Use WebKit API directly.


Modified:
   trunk/doc/reference/epiphany-sections.txt
   trunk/doc/reference/tmpl/ephy-embed.sgml
   trunk/embed/ephy-embed.c
   trunk/embed/ephy-embed.h
   trunk/embed/webkit/webkit-embed.c
   trunk/src/ephy-navigation-action.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:15:53 2008
@@ -72,7 +72,6 @@
 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

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:15:53 2008
@@ -436,14 +436,6 @@
 @Returns: 
 
 
-<!-- ##### FUNCTION ephy_embed_go_back ##### -->
-<para>
-
-</para>
-
- embed: 
-
-
 <!-- ##### FUNCTION ephy_embed_go_forward ##### -->
 <para>
 

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

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

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

Modified: trunk/src/ephy-navigation-action.c
==============================================================================
--- trunk/src/ephy-navigation-action.c	(original)
+++ trunk/src/ephy-navigation-action.c	Sun Jun 29 18:15:53 2008
@@ -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 @@
 	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 @@
 						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)
 	{

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