Merge lp:~daniel-wyatt/midori/fix-bug820735 into lp:midori

[Daniel Wyatt]

https://bugs.launchpad.net/midori/+bug/820735

[Cris Dywan (kalikiana)]

The code in midori_view_web_view_resource_response_cb uses midori_browser_get_current_uri in the View to see if a particular resource happens to be loading the top level website of the active tab… if you wanted to check every top-level URL typed in the address bar _action_location_submit_uri in midori-browser.c would be the place.

The other code doesn't and can't check where the error came from and thus skips all errors regardless of the resource check so… what's the specific intention of the code? Should it be specific to typos or include all errors? Both do not mix.

review: Needs Information

Unmerged revisions

6487. By Daniel Wyatt on 2013-11-20

Don't store URIs that failed to load in history.
This includes domains that failed to resolve.
For webkit >= 1.7.5 this also includes 404s.

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2013-11-15 02:25:36 +0000
+++ midori/midori-browser.c	2013-11-20 05:33:35 +0000
@@ -441,8 +441,10 @@
         g_object_set (action,
                       "stock-id", GTK_STOCK_REFRESH,
                       "tooltip", _("Reload the current page"), NULL);
-        katze_item_set_meta_integer (midori_view_get_proxy_item (view),
-                                     "dont-write-history", -1);
+        if (!katze_item_get_meta_boolean (midori_view_get_proxy_item (view),
+                                        "dont-write-history" ))
+            katze_item_set_meta_integer (midori_view_get_proxy_item (view),
+                                         "dont-write-history", -1);
     }
     else
     {
 
=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2013-11-16 17:37:09 +0000
+++ midori/midori-view.c	2013-11-20 05:33:35 +0000
@@ -969,6 +969,33 @@
     }
 }
 
+#if WEBKIT_CHECK_VERSION (1, 7, 5)
+static void
+midori_view_web_view_resource_response_cb (WebKitWebView*         web_view,
+                                           WebKitWebFrame*        web_frame,
+                                           WebKitWebResource*     web_resource,
+                                           WebKitNetworkResponse* response,
+                                           MidoriView*            view)
+{
+    MidoriBrowser* browser = midori_browser_get_for_widget (view->web_view);
+    if (!browser)
+        return;
+
+    const gchar* current_uri = midori_browser_get_current_uri (browser);
+    const gchar* resource_uri = webkit_web_resource_get_uri (web_resource);
+    if (g_strcmp0 (current_uri, resource_uri) == 0)
+    {
+        SoupMessage *msg = webkit_network_response_get_message (response);
+        if (!msg)
+            return;
+
+        if (msg->status_code == 404)
+            katze_item_set_meta_integer (view->item,
+                                         "dont-write-history", 1);
+    }
+}
+#endif
+
 static void
 midori_view_infobar_response_cb (GtkWidget* infobar,
                                  gint       response,
@@ -1286,6 +1313,8 @@
         return FALSE;
     }
 
+    /* Failed to load, don't store it in the history! */
+    katze_item_set_meta_integer (view->item, "dont-write-history", 1);
     title = g_strdup_printf (_("'%s' can't be found"), midori_uri_parse_hostname(uri, NULL));
     message = g_strdup_printf (_("The page '%s' couldn't be loaded:"), midori_uri_parse_hostname(uri, NULL));
 
@@ -1414,6 +1443,7 @@
 
     midori_tab_set_progress (MIDORI_TAB (view), 1.0);
     midori_view_update_load_status (view, MIDORI_LOAD_FINISHED);
+    katze_item_set_meta_integer (view->item, "dont-write-history", -1);
 }
 
 #ifdef HAVE_WEBKIT2
@@ -3578,6 +3608,10 @@
                       midori_view_web_view_navigation_decision_cb, view,
                       "signal::resource-request-starting",
                       midori_view_web_view_resource_request_cb, view,
+                      #if WEBKIT_CHECK_VERSION (1, 7, 5)
+                      "signal::resource-response-received",
+                      midori_view_web_view_resource_response_cb, view,
+                      #endif
                       "signal::database-quota-exceeded",
                       midori_view_web_view_database_quota_exceeded_cb, view,
                       "signal::geolocation-policy-decision-requested",