Merge lp:~gue5t/midori/network-error into lp:midori

[gue5t gue5t]

Only set tabs' error state if errors come from the main frame

Right now, tabs showing pages that have iframes that hit unconditional network errors get reloaded every time the network monitor says it the network is available.

This happens regularly (on my machine at least) while the network is continuously available; midori_app_network_changed gets called various times in a row with "available" equal to TRUE. And when it does, if a tab happens to contain deep in iframes one frame that hit a network error, Midori reloads the whole tab which is already showing a useful page that the user might be working with. This trashes anything they've entered into forms and resets scroll position.

To fix the problem, we only set the load error status of a tab if the main frame of the tab's view is the one that generates the error.

[Paweł Forysiuk (tuxator)]

review: Approve

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2015-03-24 23:03:26 +0000
+++ midori/midori-view.c	2015-03-28 17:43:34 +0000
@@ -1256,7 +1256,9 @@
                                         message, error->message, NULL,
                                         _("Try Again"), web_frame);
 
-    midori_tab_set_load_error (MIDORI_TAB (view), MIDORI_LOAD_ERROR_NETWORK);
+    /* if the main frame for the whole tab has a network error, set tab error status */
+    if (web_frame == webkit_web_view_get_main_frame (web_view))
+        midori_tab_set_load_error (MIDORI_TAB (view), MIDORI_LOAD_ERROR_NETWORK);
 
     g_free (message);
     g_free (title);