]> spindle.queued.net Git - midori/commitdiff
Handle frame load interrupted in the unholy trinity
authorMartin Natano <natano@natano.net>
Mon, 16 Apr 2012 17:40:20 +0000 (19:40 +0200)
committerChristian Dywan <christian@twotoasts.de>
Mon, 16 Apr 2012 17:40:20 +0000 (19:40 +0200)
See: https://bugs.launchpad.net/midori/+bug/973646

midori/midori-view.c

index bb22a2f3bdae6964ca9fdbb8d40698558ee0fbd7..2a6580e4eb818a0b3e6023fba297390e9d88cc94 100644 (file)
@@ -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;
     }