[Xfce4-commits] <midori:master> Explicitly reset 'delay' status when reloading or changing location

[Christian Dywan]

Updating branch refs/heads/master
         to 7d049555a5efd8f98c0b0f8737880dd12d4edcb4 (commit)
       from 5a86115a9aa939ebba6aac51e4e19f6017ff5ca9 (commit)

commit 7d049555a5efd8f98c0b0f8737880dd12d4edcb4
Author: Christian Dywan <christian at twotoasts.de>
Date:   Mon Aug 23 20:08:43 2010 +0200

    Explicitly reset 'delay' status when reloading or changing location

 midori/main.c        |    8 +-------
 midori/midori-view.c |    2 ++
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/midori/main.c b/midori/main.c
index 14b9727..a86d58a 100644
--- 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 8255edc..623a669 100644
--- 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);
 }