epiphany r8313 - in trunk: embed embed/webkit src

[xan svn gnome org]

Author: xan
Date: Mon Jun 30 07:23:57 2008
New Revision: 8313
URL: http://svn.gnome.org/viewvc/epiphany?rev=8313&view=rev

Log:
embed: remove ephy_embed_go_to_history_item.

Use WebKit API directly.


Modified:
   trunk/embed/ephy-embed.c
   trunk/embed/ephy-embed.h
   trunk/embed/webkit/webkit-embed.c
   trunk/src/ephy-navigation-action.c

Modified: trunk/embed/ephy-embed.c
==============================================================================
--- trunk/embed/ephy-embed.c	(original)
+++ trunk/embed/ephy-embed.c	Mon Jun 30 07:23:57 2008
@@ -993,18 +993,3 @@
 	EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed);
 	return iface->get_visibility (embed);
 }
-
-/**
- * ephy_embed_go_to_history_item:
- * @embed: an #EphyEmbed
- * @history_item: an #EphyHistoryItem
- *
- * Opens the webpage specified by @history_item in @embed's history.
- *
- **/
-void
-ephy_embed_go_to_history_item (EphyEmbed *embed, EphyHistoryItem *history_item)
-{
-	EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed);
-	iface->go_to_history_item (embed, history_item);
-}

Modified: trunk/embed/ephy-embed.h
==============================================================================
--- trunk/embed/ephy-embed.h	(original)
+++ trunk/embed/ephy-embed.h	Mon Jun 30 07:23:57 2008
@@ -224,8 +224,6 @@
 	gboolean	   (* get_is_blank)		  (EphyEmbed *embed);
 	const char *	   (* get_loading_title)	  (EphyEmbed *embed);
 	gboolean	   (* get_visibility)		  (EphyEmbed *embed);
-	void		   (* go_to_history_item)	  (EphyEmbed *embed,
-							   EphyHistoryItem *history_item);
 };
 
 GType		  ephy_embed_net_state_get_type		(void);
@@ -349,9 +347,6 @@
 
 gboolean	  ephy_embed_has_modified_forms		(EphyEmbed *embed);
 
-/* History */
-void		 ephy_embed_go_to_history_item		(EphyEmbed *embed, EphyHistoryItem *history_item);
-
 G_END_DECLS
 
 #endif

Modified: trunk/embed/webkit/webkit-embed.c
==============================================================================
--- trunk/embed/webkit/webkit-embed.c	(original)
+++ trunk/embed/webkit/webkit-embed.c	Mon Jun 30 07:23:57 2008
@@ -452,15 +452,6 @@
 }
 
 static void
-impl_go_to_history_item (EphyEmbed *embed, EphyHistoryItem *history_item)
-{
-  WebKitEmbed *wembed = WEBKIT_EMBED (embed);
-  WebKitWebHistoryItem *item = WEBKIT_HISTORY_ITEM (history_item)->data;
-  
-  webkit_web_view_go_to_back_forward_item (wembed->priv->web_view, item);
-}
-
-static void
 ephy_embed_iface_init (EphyEmbedIface *iface)
 {
   iface->load_url = impl_load_url; 
@@ -486,5 +477,4 @@
   iface->print_preview_navigate = impl_print_preview_navigate;
   iface->has_modified_forms = impl_has_modified_forms;
   iface->get_security_level = impl_get_security_level;
-  iface->go_to_history_item = impl_go_to_history_item;
 }

Modified: trunk/src/ephy-navigation-action.c
==============================================================================
--- trunk/src/ephy-navigation-action.c	(original)
+++ trunk/src/ephy-navigation-action.c	Mon Jun 30 07:23:57 2008
@@ -118,7 +118,7 @@
 activate_back_or_forward_menu_item_cb (GtkWidget *menuitem,
 				       EphyNavigationAction *action)
 {
-	EphyHistoryItem *item;
+	WebKitWebHistoryItem *item;
 	EphyEmbed *embed;
 
 	embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (action->priv->window));
@@ -131,10 +131,10 @@
 		g_return_if_fail (embed != NULL);
 	}
 
-	item = (EphyHistoryItem*)g_object_get_data (G_OBJECT (menuitem), HISTORY_ITEM_DATA_KEY);
+	item = (WebKitWebHistoryItem*)g_object_get_data (G_OBJECT (menuitem), HISTORY_ITEM_DATA_KEY);
 	g_return_if_fail (item != NULL);
 
-	ephy_embed_go_to_history_item (embed, item);
+	webkit_web_view_go_to_back_forward_item (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed), item);
 }
 
 static void