Merge lp:~ivaldi/midori/tabby-delay-after-crash into lp:midori

[André Stösel]

delay tab loading after midori crashed

[Cris Dywan (kalikiana)]

Very smart one that. I aritifically created some scenarios where something "crashed" and found it to behave quite nicely making sure whatever was active wouldn't load - unless I reload or purposely switch back and forth to open it, which seems sensible to me.

Ideally this would be tested somehow but as I was struggling to make all tests pass let's leave that for later.

review: Approve

=== modified file 'extensions/tabby.vala'
--- extensions/tabby.vala	2014-01-06 21:01:25 +0000
+++ extensions/tabby.vala	2014-01-12 18:28:51 +0000
@@ -170,6 +170,11 @@
                 APP.settings.get ("load-on-startup", out load_on_startup);
                 should_delay = load_on_startup == Midori.MidoriStartup.DELAYED_PAGES;
 
+                if (APP.crashed == true) {
+                    delay = true;
+                    should_delay = true;
+                }
+
                 this.state = SessionState.RESTORING;
 
                 GLib.Idle.add (() => {

=== modified file 'midori/midori-app.c'
--- midori/midori-app.c	2013-09-07 20:38:45 +0000
+++ midori/midori-app.c	2014-01-12 18:28:51 +0000
@@ -615,6 +615,11 @@
 gboolean
 midori_app_get_crashed (MidoriApp* app)
 {
+    static gint cache = -1;
+
+    if (cache != -1)
+        return (gboolean) cache;
+
     if (!midori_paths_is_readonly ())
     {
         /* We test for the presence of a dummy file which is created once
@@ -624,10 +629,14 @@
         if (!crashed)
             g_file_set_contents (config_file, "RUNNING", -1, NULL);
         g_free (config_file);
-        if (crashed)
+        if (crashed) {
+            cache = 1;
             return TRUE;
+        }
     }
 
+    cache = 0;
+
     return FALSE;
 }
 

=== modified file 'midori/midori.vapi'
--- midori/midori.vapi	2013-12-12 14:20:49 +0000
+++ midori/midori.vapi	2014-01-12 18:28:51 +0000
@@ -51,6 +51,7 @@
         [NoAccessorMethod]
         public Katze.Array browsers { get; }
         public Browser? browser { get; }
+        public bool crashed { get; }
 
         [HasEmitter]
         public signal void add_browser (Browser browser);