diff options
| -rw-r--r-- | doc/reference/epiphany-sections.txt | 1 | ||||
| -rw-r--r-- | doc/reference/tmpl/ephy-embed.sgml | 9 | ||||
| -rw-r--r-- | embed/ephy-base-embed.c | 6 | ||||
| -rw-r--r-- | embed/ephy-embed.c | 18 | ||||
| -rw-r--r-- | embed/ephy-embed.h | 5 | ||||
| -rw-r--r-- | embed/webkit/webkit-embed.c | 8 | ||||
| -rw-r--r-- | src/epiphany.defs | 9 | ||||
| -rw-r--r-- | src/window-commands.c | 6 |
8 files changed, 9 insertions, 53 deletions
diff --git a/doc/reference/epiphany-sections.txt b/doc/reference/epiphany-sections.txt index 39b0dbfab..30bdf886e 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_reload ephy_embed_get_title ephy_embed_get_location ephy_embed_get_link_message diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml index 7ef4950d0..edb06be65 100644 --- a/doc/reference/tmpl/ephy-embed.sgml +++ b/doc/reference/tmpl/ephy-embed.sgml @@ -363,15 +363,6 @@ windows opened with JavaScript often use a nonstandard chrome. @url: -<!-- ##### FUNCTION ephy_embed_reload ##### --> -<para> - -</para> - -@embed: -@force: - - <!-- ##### FUNCTION ephy_embed_get_title ##### --> <para> 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; diff --git a/src/epiphany.defs b/src/epiphany.defs index d2b8d3ef3..2c7fa8bc8 100644 --- a/src/epiphany.defs +++ b/src/epiphany.defs @@ -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") diff --git a/src/window-commands.c b/src/window-commands.c index ce0392d44..de5c9ec40 100644 --- a/src/window-commands.c +++ b/src/window-commands.c @@ -212,7 +212,11 @@ window_cmd_view_reload (GtkAction *action, 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 |