From: Christian Dywan <christian@twotoasts.de>
Date: Thu, 7 Apr 2011 18:59:08 +0000 (+0200)
Subject: Don't consider 'Plugin will handle load' an error
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d4f288ba0b3049d4617d8f4329b12cc9e4f5e44;p=midori

Don't consider 'Plugin will handle load' an error
---

diff --git a/midori/midori-view.c b/midori/midori-view.c
index 49eb95ca..11373c59 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -1450,9 +1450,20 @@ webkit_web_view_load_error_cb (WebKitWebView*  web_view,
                                GError*         error,
                                MidoriView*     view)
 {
-    gchar* title = g_strdup_printf (_("Error - %s"), uri);
-    gchar* message = g_strdup_printf (_("The page '%s' couldn't be loaded."), uri);
-    gboolean result = midori_view_display_error (view, uri, title,
+    gchar* title;
+    gchar* message;
+    gboolean result;
+
+    switch (error->code)
+    {
+    case WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD:
+        /* A plugin will take over. That's expected, it's not fatal. */
+        return FALSE;
+    }
+
+    title = g_strdup_printf (_("Error - %s"), uri);
+    message = g_strdup_printf (_("The page '%s' couldn't be loaded."), uri);
+    result = midori_view_display_error (view, uri, title,
         message, error->message, _("Try again"), web_frame);
     g_free (message);
     g_free (title);