Updating branch refs/heads/master to 64bb60afd864df1f221b68d5d1da0da6ea31056f (commit) from 93e4b17e4fcae75056a196464e384d56ff19c00f (commit)
commit 64bb60afd864df1f221b68d5d1da0da6ea31056f Author: André Stösel <an...@stoesel.de> Date: Fri May 13 16:07:28 2011 +0200 Don't fail on network cancelled errors midori/midori-view.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 8b72b80..42bfb19 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1514,6 +1514,9 @@ webkit_web_view_load_error_cb (WebKitWebView* web_view, 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. */ + return FALSE; } title = g_strdup_printf (_("Error - %s"), uri); _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits