From a2c6d61b3e04f6c77c9f1ffd853831b51e0a0042 Mon Sep 17 00:00:00 2001
From: Xan Lopez <xan@src.gnome.org>
Date: Sun, 29 Jun 2008 18:15:43 +0000
Subject: embed: remove ephy_embed_stop_load.

Use webkit API directly in window-commands.c

svn path=/trunk/; revision=8302
---
 doc/reference/epiphany-sections.txt |  1 -
 doc/reference/tmpl/ephy-embed.sgml  |  9 ---------
 embed/ephy-embed.c                  | 13 -------------
 embed/ephy-embed.h                  |  3 ---
 embed/webkit/webkit-embed.c         |  7 -------
 src/epiphany.defs                   |  6 ------
 src/window-commands.c               |  3 ++-
 7 files changed, 2 insertions(+), 40 deletions(-)

diff --git a/doc/reference/epiphany-sections.txt b/doc/reference/epiphany-sections.txt
index b3a34220d..39b0dbfab 100644
--- a/doc/reference/epiphany-sections.txt
+++ b/doc/reference/epiphany-sections.txt
@@ -64,7 +64,6 @@ EmbedReloadFlags
 EmbedPrintPreviewNavType
 EmbedSecurityLevel
 ephy_embed_load_url
-ephy_embed_stop_load
 ephy_embed_reload
 ephy_embed_get_title
 ephy_embed_get_location
diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml
index 653669e34..7ef4950d0 100644
--- a/doc/reference/tmpl/ephy-embed.sgml
+++ b/doc/reference/tmpl/ephy-embed.sgml
@@ -291,7 +291,6 @@ be done by casting).
 @new_document_now: 
 @load_url: 
 @load: 
-@stop_load: 
 @reload: 
 @can_go_back: 
 @can_go_forward: 
@@ -364,14 +363,6 @@ windows opened with JavaScript often use a nonstandard chrome.
 @url: 
 
 
-<!-- ##### FUNCTION ephy_embed_stop_load ##### -->
-<para>
-
-</para>
-
-@embed: 
-
-
 <!-- ##### FUNCTION ephy_embed_reload ##### -->
 <para>
 
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index 98f9d30b5..12485de2a 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -405,19 +405,6 @@ ephy_embed_load (EphyEmbed *embed,
 	iface->load (embed, url, flags, referring_embed);
 }
 
-/**
- * ephy_embed_stop_load:
- * @embed: an #EphyEmbed
- *
- * If @embed is loading, stops it from continuing.
- **/
-void
-ephy_embed_stop_load (EphyEmbed *embed)
-{
-	EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed);
-	iface->stop_load (embed);
-}
-
 /**
  * ephy_embed_can_go_back:
  * @embed: an #EphyEmbed
diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h
index b6adab1ed..b96ac2e97 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);
-	void		   (* stop_load)		  (EphyEmbed *embed);
 	void		   (* reload)			  (EphyEmbed *embed,
 							   gboolean force);
 	gboolean	   (* can_go_back)		  (EphyEmbed *embed);
@@ -260,8 +259,6 @@ void		  ephy_embed_load			(EphyEmbed *embed,
 							 EphyEmbedLoadFlags flags,
 							 EphyEmbed *referring_embed);
 
-void		  ephy_embed_stop_load			(EphyEmbed *embed);
-
 void		  ephy_embed_reload			(EphyEmbed *embed,
 							 gboolean force);
 
diff --git a/embed/webkit/webkit-embed.c b/embed/webkit/webkit-embed.c
index 9638d5c8f..33e59eec3 100644
--- a/embed/webkit/webkit-embed.c
+++ b/embed/webkit/webkit-embed.c
@@ -365,12 +365,6 @@ impl_load (EphyEmbed *embed,
   g_free (effective_url);
 }
 
-static void
-impl_stop_load (EphyEmbed *embed)
-{
-  webkit_web_view_stop_loading (WEBKIT_EMBED (embed)->priv->web_view);
-}
-
 static gboolean
 impl_can_go_back (EphyEmbed *embed)
 {
@@ -591,7 +585,6 @@ ephy_embed_iface_init (EphyEmbedIface *iface)
 {
   iface->load_url = impl_load_url; 
   iface->load = impl_load; 
-  iface->stop_load = impl_stop_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;
diff --git a/src/epiphany.defs b/src/epiphany.defs
index f3361ce1e..d2b8d3ef3 100644
--- a/src/epiphany.defs
+++ b/src/epiphany.defs
@@ -1023,12 +1023,6 @@
   )
 )
 
-(define-method stop_load
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_stop_load")
-  (return-type "none")
-)
-
 (define-method reload
   (of-object "EphyEmbed")
   (c-name "ephy_embed_reload")
diff --git a/src/window-commands.c b/src/window-commands.c
index d9e15d913..ce0392d44 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -24,6 +24,7 @@
 #include "ephy-embed-container.h"
 #include "ephy-embed-shell.h"
 #include "ephy-embed-single.h"
+#include "ephy-embed-utils.h"
 #include "ephy-shell.h"
 #include "ephy-embed-factory.h"
 #include "ephy-embed-persist.h"
@@ -196,7 +197,7 @@ window_cmd_view_stop (GtkAction *action,
 
 	gtk_widget_grab_focus (GTK_WIDGET (embed));
 
-	ephy_embed_stop_load (embed);
+	webkit_web_view_stop_loading (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed));
 }
 
 void
-- 
cgit v1.2.3