[Xfce4-commits] <midori:master> Handle frame load interrupted in the unholy trinity

[Christian Dywan]

Updating branch refs/heads/master
         to d2059fcec1c680a85990440c74bce6c2e9a866b6 (commit)
       from 410eabea4094b5d582bb7779e81d5f2d9281ba52 (commit)

commit d2059fcec1c680a85990440c74bce6c2e9a866b6
Author: Martin Natano <natano at natano.net>
Date:   Mon Apr 16 19:40:20 2012 +0200

    Handle frame load interrupted in the unholy trinity
    
    See: https://bugs.launchpad.net/midori/+bug/973646

 midori/midori-view.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/midori/midori-view.c b/midori/midori-view.c
index bb22a2f..2a6580e 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -1463,13 +1463,15 @@ webkit_web_view_load_error_cb (WebKitWebView*  web_view,
     gchar* message;
     gboolean result;
 
+    /* The unholy trinity; also ignored in Webkit's default error handler */
     switch (error->code)
     {
     case WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD:
         /* A plugin will take over. That's expected, it's not fatal. */
-        return FALSE;
     case WEBKIT_NETWORK_ERROR_CANCELLED:
         /* Mostly initiated by JS redirects. */
+    case WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE:
+        /* A frame load is cancelled because of a download. */
         return FALSE;
     }