Explicitly reset 'delay' status when reloading or changing location

diff --git a/midori/main.c b/midori/main.c
index 14b97272a41a3387420be88b876a048682f911c7..a86d58ac1c47368742f3f3e94b2464a9eafcc11b 100644 (file)
--- a/midori/main.c
+++ b/midori/main.c
@@ -510,10 +510,7 @@ midori_session_add_delay (KatzeArray* session)
     KatzeItem* item;
     gint i = 0;
     while ((item = katze_array_get_nth_item (session, i++)))
-    {
-        if (katze_item_get_meta_integer (item, "delay") < 0)
-            katze_item_set_meta_integer (item, "delay", 1);
-    }
+        katze_item_set_meta_integer (item, "delay", 1);
 }
 
 static void
@@ -2043,7 +2040,6 @@ main (int    argc,
             uri_ready = midori_prepare_uri (uri);
             katze_item_set_uri (item, uri_ready);
             g_free (uri_ready);
-            katze_item_set_meta_integer (item, "delay", 0);
             katze_array_add_item (_session, item);
             uri = strtok (NULL, "|");
         }
@@ -2077,9 +2073,7 @@ main (int    argc,
        and deleted during normal runtime, but persists in case of a crash. */
     katze_assign (config_file, build_config_filename ("running"));
     if (g_access (config_file, F_OK) == 0)
-    {
         back_from_crash = TRUE;
-    }
     else
         g_file_set_contents (config_file, "RUNNING", -1, NULL);
 

diff --git a/midori/midori-view.c b/midori/midori-view.c
index 8255edc6a9773bf38a258fd92b420abebdfeadc2..623a6691e75ac78bd72d09033b7876ab32039a38 100644 (file)
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -3644,6 +3644,7 @@ midori_view_set_uri (MidoriView*  view,
         {
             katze_assign (view->uri, sokoke_format_uri_for_display (uri));
             katze_item_set_uri (view->item, uri);
+            katze_item_set_meta_integer (view->item, "delay", -1);
             g_object_notify (G_OBJECT (view), "uri");
             webkit_web_view_open (WEBKIT_WEB_VIEW (view->web_view), uri);
         }
@@ -4454,6 +4455,7 @@ midori_view_reload (MidoriView* view,
         webkit_web_view_reload (WEBKIT_WEB_VIEW (view->web_view));
     else
         webkit_web_view_reload_bypass_cache (WEBKIT_WEB_VIEW (view->web_view));
+    katze_item_set_meta_integer (view->item, "delay", -1);
 
     g_free (title);
 }