aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorMartin Robinson <mrobinson@igalia.com>2012-08-14 00:44:17 +0800
committerMartin Robinson <mrobinson@igalia.com>2012-08-14 01:48:42 +0800
commit1a2bf54a1f7a949491a8cb5b7beff27eb550100d (patch)
tree71a75c6550d5028fc57c2896d39e587a41d7b6ed /embed
parent7316adc19cc50bde288bbb8a4007dc0d6a9bd078 (diff)
downloadgsoc2013-epiphany-1a2bf54a1f7a949491a8cb5b7beff27eb550100d.tar
gsoc2013-epiphany-1a2bf54a1f7a949491a8cb5b7beff27eb550100d.tar.gz
gsoc2013-epiphany-1a2bf54a1f7a949491a8cb5b7beff27eb550100d.tar.bz2
gsoc2013-epiphany-1a2bf54a1f7a949491a8cb5b7beff27eb550100d.tar.lz
gsoc2013-epiphany-1a2bf54a1f7a949491a8cb5b7beff27eb550100d.tar.xz
gsoc2013-epiphany-1a2bf54a1f7a949491a8cb5b7beff27eb550100d.tar.zst
gsoc2013-epiphany-1a2bf54a1f7a949491a8cb5b7beff27eb550100d.zip
Use webkit_web_frame_load_alternate_string to load error pages
webkit_web_view_load_string, which was used previously, does not add the error page to the back forward list. This means that when you go back from an error page (n) you will skip directly to an older page (n-2) or not be able to go back if the error page was the first loaded.
Diffstat (limited to 'embed')
-rw-r--r--embed/ephy-web-view.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 682a98d39..26d4b2e07 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -2501,8 +2501,8 @@ ephy_web_view_load_error_page (EphyWebView *view,
#ifdef HAVE_WEBKIT2
webkit_web_view_replace_content (WEBKIT_WEB_VIEW (view), html->str, uri, 0);
#else
- webkit_web_view_load_string (WEBKIT_WEB_VIEW (view),
- html->str, "text/html", "utf8", uri);
+ webkit_web_frame_load_alternate_string (webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view)),
+ html->str, uri, uri);
#endif
g_string_free (html, TRUE);
}