aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
Diffstat (limited to 'embed')
-rw-r--r--embed/ephy-base-embed.c6
-rw-r--r--embed/ephy-embed.c18
-rw-r--r--embed/ephy-embed.h5
-rw-r--r--embed/webkit/webkit-embed.c8
4 files changed, 4 insertions, 33 deletions
diff --git a/embed/ephy-base-embed.c b/embed/ephy-base-embed.c
index 5c2f506e5..28a64008f 100644
--- a/embed/ephy-base-embed.c
+++ b/embed/ephy-base-embed.c
@@ -1305,8 +1305,10 @@ ephy_base_embed_file_monitor_reload_cb (EphyBaseEmbed *embed)
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;
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index 12485de2a..fe543a934 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -578,24 +578,6 @@ ephy_embed_get_js_status (EphyEmbed *embed)
}
/**
- * 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
diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h
index b96ac2e97..c5469db26 100644
--- a/embed/ephy-embed.h
+++ b/embed/ephy-embed.h
@@ -170,8 +170,6 @@ struct _EphyEmbedIface
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 @@ void ephy_embed_load (EphyEmbed *embed,
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,
diff --git a/embed/webkit/webkit-embed.c b/embed/webkit/webkit-embed.c
index 33e59eec3..45d2bfc47 100644
--- a/embed/webkit/webkit-embed.c
+++ b/embed/webkit/webkit-embed.c
@@ -420,13 +420,6 @@ impl_get_location (EphyEmbed *embed,
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 @@ ephy_embed_iface_init (EphyEmbedIface *iface)
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;