Handle frame load interrupted in the unholy trinity
See: https://bugs.launchpad.net/midori/+bug/973646
This commit is contained in:
parent
410eabea40
commit
d2059fcec1
1 changed files with 3 additions and 1 deletions
|
@ -1463,13 +1463,15 @@ webkit_web_view_load_error_cb (WebKitWebView* web_view,
|
||||||
gchar* message;
|
gchar* message;
|
||||||
gboolean result;
|
gboolean result;
|
||||||
|
|
||||||
|
/* The unholy trinity; also ignored in Webkit's default error handler */
|
||||||
switch (error->code)
|
switch (error->code)
|
||||||
{
|
{
|
||||||
case WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD:
|
case WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD:
|
||||||
/* A plugin will take over. That's expected, it's not fatal. */
|
/* A plugin will take over. That's expected, it's not fatal. */
|
||||||
return FALSE;
|
|
||||||
case WEBKIT_NETWORK_ERROR_CANCELLED:
|
case WEBKIT_NETWORK_ERROR_CANCELLED:
|
||||||
/* Mostly initiated by JS redirects. */
|
/* 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;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue