[Xfce4-commits] <midori:master> Never delay URIs given as command line arguments

[Christian Dywan]

Updating branch refs/heads/master
         to 6a3c3d155aae97b3025aac88b385f567019abcaf (commit)
       from 0b880b8a9b8cafddd49ed361298d141c4962071f (commit)

commit 6a3c3d155aae97b3025aac88b385f567019abcaf
Author: Christian Dywan <christian at twotoasts.de>
Date:   Thu Jul 28 23:08:03 2011 +0200

    Never delay URIs given as command line arguments

 midori/main.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/midori/main.c b/midori/main.c
index 004906c..e49181d 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -599,7 +599,10 @@ midori_session_add_delay (KatzeArray* session)
 {
     KatzeItem* item;
     KATZE_ARRAY_FOREACH_ITEM (item, session)
-        katze_item_set_meta_integer (item, "delay", 1);
+    {
+        if (katze_item_get_meta_integer (item, "delay") == -1)
+            katze_item_set_meta_integer (item, "delay", 1);
+    }
 }
 
 static void
@@ -2470,6 +2473,8 @@ main (int    argc,
             uri_ready = midori_prepare_uri (uri);
             katze_item_set_uri (item, uri_ready);
             g_free (uri_ready);
+            /* Never delay command line arguments */
+            katze_item_set_meta_integer (item, "delay", 0);
             katze_array_add_item (_session, item);
             uri = strtok (NULL, "|");
         }