From d2059fcec1c680a85990440c74bce6c2e9a866b6 Mon Sep 17 00:00:00 2001 From: Martin Natano Date: Mon, 16 Apr 2012 19:40:20 +0200 Subject: [PATCH] Handle frame load interrupted in the unholy trinity See: https://bugs.launchpad.net/midori/+bug/973646 --- midori/midori-view.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index bb22a2f3..2a6580e4 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; } -- 2.39.5