[Xfce4-commits] <midori:master> Set special to false before loading an undelayed tab

[Christian Dywan]

Updating branch refs/heads/master
         to 89a22d3cb09774c1cd5865165ad95474e36cca17 (commit)
       from 69556adb42178b90f2834a75a3a7c9718300c8e2 (commit)

commit 89a22d3cb09774c1cd5865165ad95474e36cca17
Author: André Stösel <andre at stoesel.de>
Date:   Mon Nov 26 15:55:18 2012 +0100

    Set special to false before loading an undelayed tab
    
    Fix expected test results for delayed loading

 midori/midori-view.c |    3 +++
 tests/tab.vala       |    6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/midori/midori-view.c b/midori/midori-view.c
index b413cea..9fc8898 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -738,7 +738,10 @@ midori_view_web_view_navigation_decision_cb (WebKitWebView*             web_view
     #endif
 
     if (katze_item_get_meta_integer (view->item, "delay") == MIDORI_DELAY_PENDING_UNDELAY)
+    {
+        midori_tab_set_special (MIDORI_TAB (view), FALSE);
         katze_item_set_meta_integer (view->item, "delay", MIDORI_DELAY_UNDELAYED);
+    }
 
     /* Remove link labels */
     js_context = webkit_web_frame_get_global_context (web_frame);
diff --git a/tests/tab.vala b/tests/tab.vala
index 01e5524..c8c5ce1 100644
--- a/tests/tab.vala
+++ b/tests/tab.vala
@@ -118,9 +118,9 @@ void tab_special () {
     item.set_meta_integer ("delay", Midori.Delay.UNDELAYED);
     tab.set_uri ("http://example.com");
     do { loop.iteration (true); } while (tab.load_status != Midori.LoadStatus.FINISHED);
-    /* FIXME assert (!tab.can_view_source ()); */
-    /* FIXME assert (tab.special); */
-    /* FIXME assert (!tab.can_save ()); */
+    assert (tab.can_view_source ());
+    assert (!tab.special);
+    assert (tab.can_save ());
 
     var test_address = new Soup.Address ("127.0.0.1", Soup.ADDRESS_ANY_PORT);
     test_address.resolve_sync (null);