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

[xan svn gnome org]

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

Log:
embed: remove ephy_embed_reload.

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

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:48 2008
@@ -363,15 +363,6 @@
 @url: 
 
 
-<!-- ##### FUNCTION ephy_embed_reload ##### -->
-<para>
-
-</para>
-
- embed: 
- force: 
-
-
 <!-- ##### FUNCTION ephy_embed_get_title ##### -->
 <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:15:48 2008
@@ -1305,8 +1305,10 @@
   priv->reload_scheduled_id = 0;
 
   LOG ("Reloading file '%s'", ephy_embed_get_address (EPHY_EMBED (embed)));
-
-  ephy_embed_reload (EPHY_EMBED (embed), TRUE);
+  /* FIXME: no way to bypass cache when reloading with WebKit right now.
+   * Old code did it here.
+   */
+  webkit_web_view_reload (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed));
 
   /* don't run again */
   return FALSE;

Modified: trunk/embed/ephy-embed.c
==============================================================================
--- trunk/embed/ephy-embed.c	(original)
+++ trunk/embed/ephy-embed.c	Sun Jun 29 18:15:48 2008
@@ -578,24 +578,6 @@
 }
 
 /**
- * ephy_embed_reload:
- * @embed: an #EphyEmbed
- * @force: %TRUE to bypass cache
- *
- * Reloads the web page being displayed in @embed.
- *
- * If @force is %TRUE, cache and proxy will be bypassed when
- * reloading the page.
- **/
-void
-ephy_embed_reload (EphyEmbed *embed,
-		   gboolean force)
-{
-	EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed);
-	iface->reload (embed, force);
-}
-
-/**
  * ephy_embed_set_zoom:
  * @embed: an #EphyEmbed
  * @zoom: the new zoom level

Modified: trunk/embed/ephy-embed.h
==============================================================================
--- trunk/embed/ephy-embed.h	(original)
+++ trunk/embed/ephy-embed.h	Sun Jun 29 18:15:48 2008
@@ -170,8 +170,6 @@
 							   const char *url,
 							   EphyEmbedLoadFlags flags,
 							   EphyEmbed *referring_embed);
-	void		   (* reload)			  (EphyEmbed *embed,
-							   gboolean force);
 	gboolean	   (* can_go_back)		  (EphyEmbed *embed);
 	gboolean	   (* can_go_forward)		  (EphyEmbed *embed);
 	gboolean	   (* can_go_up)		  (EphyEmbed *embed);
@@ -259,9 +257,6 @@
 							 EphyEmbedLoadFlags flags,
 							 EphyEmbed *referring_embed);
 
-void		  ephy_embed_reload			(EphyEmbed *embed,
-							 gboolean force);
-
 const char	 *ephy_embed_get_title			(EphyEmbed *embed);
 
 char		 *ephy_embed_get_location		(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:48 2008
@@ -420,13 +420,6 @@
   return g_strdup (webkit_web_frame_get_uri (web_frame));
 }
 
-static void
-impl_reload (EphyEmbed *embed,
-             gboolean force)
-{
-  webkit_web_view_reload (WEBKIT_EMBED (embed)->priv->web_view);
-}
-
 static float
 impl_get_zoom (EphyEmbed *embed)
 {
@@ -594,7 +587,6 @@
   iface->go_up = impl_go_up;
   iface->get_location = impl_get_location;
   iface->get_js_status = impl_get_js_status;
-  iface->reload = impl_reload;
   iface->set_zoom = impl_set_zoom;
   iface->get_zoom = impl_get_zoom;
   iface->scroll_lines = impl_scroll_lines;

Modified: trunk/src/epiphany.defs
==============================================================================
--- trunk/src/epiphany.defs	(original)
+++ trunk/src/epiphany.defs	Sun Jun 29 18:15:48 2008
@@ -1023,15 +1023,6 @@
   )
 )
 
-(define-method reload
-  (of-object "EphyEmbed")
-  (c-name "ephy_embed_reload")
-  (return-type "none")
-  (parameters
-    '("gboolean" "force")
-  )
-)
-
 (define-method get_title
   (of-object "EphyEmbed")
   (c-name "ephy_embed_get_title")

Modified: trunk/src/window-commands.c
==============================================================================
--- trunk/src/window-commands.c	(original)
+++ trunk/src/window-commands.c	Sun Jun 29 18:15:48 2008
@@ -212,7 +212,11 @@
 
 	gtk_widget_grab_focus (GTK_WIDGET (embed));
 
-	ephy_embed_reload (embed, event_with_shift ());
+	/* FIXME: no way to bypass cache when reloading
+	 * with WebKit right now. Old code did:
+	 * ephy_embed_reload (embed, event_with_shift ());
+	 */
+	webkit_web_view_reload (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed));
 }
 
 void