epiphany-extensions r1815 - in trunk/extensions: adblock auto-reload

[xan svn gnome org]

Author: xan
Date: Sat Feb 21 11:00:31 2009
New Revision: 1815
URL: http://svn.gnome.org/viewvc/epiphany-extensions?rev=1815&view=rev

Log:
auto-reload, adblock: use WebKit API to reload, the embed API is gone.

Modified:
   trunk/extensions/adblock/ephy-adblock-extension.c
   trunk/extensions/auto-reload/ephy-auto-reload-extension.c

Modified: trunk/extensions/adblock/ephy-adblock-extension.c
==============================================================================
--- trunk/extensions/adblock/ephy-adblock-extension.c	(original)
+++ trunk/extensions/adblock/ephy-adblock-extension.c	Sat Feb 21 11:00:31 2009
@@ -16,7 +16,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- *  $Id$
  */
 
 #include "config.h"
@@ -241,6 +240,7 @@
 	{
 		EphyAdblockExtension *ext;
 		AdBlocker *blocker;
+		WebKitWebView *view;
 		EphyEmbed *embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window));
 
 		ext = EPHY_ADBLOCK_EXTENSION (g_object_get_data (G_OBJECT (window),
@@ -251,7 +251,8 @@
 
 		ad_blocker_set_noblock (blocker);
 
-		ephy_embed_reload (embed, FALSE);
+		view = EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed);
+		webkit_web_view_reload (view);
 
 		return TRUE;
 	}

Modified: trunk/extensions/auto-reload/ephy-auto-reload-extension.c
==============================================================================
--- trunk/extensions/auto-reload/ephy-auto-reload-extension.c	(original)
+++ trunk/extensions/auto-reload/ephy-auto-reload-extension.c	Sat Feb 21 11:00:31 2009
@@ -116,6 +116,7 @@
 ephy_auto_reload_timeout (EphyEmbed *embed)
 {
 	guint new_timeout;
+	WebKitWebView *view;
 	/* See below for these
 	TimeoutData *timeout;
 	guint old_timeout;
@@ -126,7 +127,8 @@
 	LOG ("AutoReload tab: %s", ephy_embed_get_title (embed));
 
 	/* Reload the page */
-	ephy_embed_reload (embed, TRUE);
+	view = EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed);
+	webkit_web_view_reload_bypass_cache (view);
 
 	/* Retreive the old timeout value (if we want to do something relative to it
 	timeout = (TimeoutData *) g_object_get_data (G_OBJECT (tab), TIMEOUT_DATA_KEY);