From 0f908f65bff9b8ea72bf23d08231ce4c3630185f Mon Sep 17 00:00:00 2001
From: Pootle daemon <pootle@pootle.sugarlabs.org>
Date: Wed, 03 Oct 2012 04:32:10 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:browse/mainline

---
diff --git a/browser.py b/browser.py
index fb8a985..4488580 100644
--- a/browser.py
+++ b/browser.py
@@ -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'),
--
cgit v0.9.1