diff options
author | Pootle daemon <pootle@pootle.sugarlabs.org> | 2012-10-03 04:32:10 (GMT) |
---|---|---|
committer | Pootle daemon <pootle@pootle.sugarlabs.org> | 2012-10-03 04:32:10 (GMT) |
commit | 0f908f65bff9b8ea72bf23d08231ce4c3630185f (patch) | |
tree | fd86b857ac4aeeb235a2779a0e9902d54dc86f57 | |
parent | b952780d49771e6ccb3122879b0b207ccb1779b4 (diff) | |
parent | 369e3223776afb76cb9cc11483bfe40cc2a55d0c (diff) |
Merge branch 'master' of git.sugarlabs.org:browse/mainline
-rw-r--r-- | browser.py | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -643,6 +643,12 @@ class Browser(WebKit.WebView): def __load_error_cb(self, web_view, web_frame, uri, web_error): """Show Sugar's error page""" + # Don't show error page if the load was interrupted by policy + # change. For example, if a file was requested for download + if web_error.code == WebKit.PolicyError.\ + FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE: + return True + data = { 'page_title': _('This web page could not be loaded'), 'title': _('This web page could not be loaded'), |