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

[xan svn gnome org]

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

Log:
embed: remove ephy_embed_stop_load.

Use webkit API directly in window-commands.c


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/epiphany.defs
   trunk/src/window-commands.c

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:43 2008
@@ -64,7 +64,6 @@
 EmbedPrintPreviewNavType
 EmbedSecurityLevel
 ephy_embed_load_url
-ephy_embed_stop_load
 ephy_embed_reload
 ephy_embed_get_title
 ephy_embed_get_location

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:43 2008
@@ -291,7 +291,6 @@
 @new_document_now: 
 @load_url: 
 @load: 
- stop_load: 
 @reload: 
 @can_go_back: 
 @can_go_forward: 
@@ -364,14 +363,6 @@
 @url: 
 
 
-<!-- ##### FUNCTION ephy_embed_stop_load ##### -->
-<para>
-
-</para>
-
- embed: 
-
-
 <!-- ##### FUNCTION ephy_embed_reload ##### -->
 <para>
 

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

Modified: trunk/embed/ephy-embed.h
==============================================================================
--- trunk/embed/ephy-embed.h	(original)
+++ trunk/embed/ephy-embed.h	Sun Jun 29 18:15:43 2008
@@ -170,7 +170,6 @@
 							   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 @@
 							 EphyEmbedLoadFlags flags,
 							 EphyEmbed *referring_embed);
 
-void		  ephy_embed_stop_load			(EphyEmbed *embed);
-
 void		  ephy_embed_reload			(EphyEmbed *embed,
 							 gboolean force);
 

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:43 2008
@@ -365,12 +365,6 @@
   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 @@
 {
   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;

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

Modified: trunk/src/window-commands.c
==============================================================================
--- trunk/src/window-commands.c	(original)
+++ trunk/src/window-commands.c	Sun Jun 29 18:15:43 2008
@@ -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 @@
 
 	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