Merge lp:~midori/midori/noSessionOnStartup into lp:midori

[Cris Dywan]

Open speed dial or homepage according to preference

[gue5t gue5t (gue5t)]

Tested without regressions, but it seems that if the startup preference is Speed Dial or Homepage, then a new session is added to the tabby db file without removing the old ones.

[lp:~midori/midori/noSessionOnStartup]

6485. By André Stösel on 2013-11-19

check MidoriStartup before delaying pages

[André Stösel (ivaldi)]

Maybe we should use Midori.MidoriStartup.DELAYED_PAGES as default value?

review: Approve

[Cris Dywan (kalikiana)]

Let's leave the defaults as they are and re-visit this in the next cycle, if there's a chance that we merge the settings it would be pointless to move the cheese back and forth now.

review: Approve

=== modified file 'extensions/delayed-load.vala'
--- extensions/delayed-load.vala	2013-11-07 23:50:46 +0000
+++ extensions/delayed-load.vala	2013-11-19 20:42:17 +0000
@@ -31,9 +31,6 @@
         }
 
         public void activated (Midori.App app) {
-            /* FIXME: override behavior without changing the preference */
-            app.settings.load_on_startup = Midori.MidoriStartup.DELAYED_PAGES;
-
             foreach (Midori.Browser browser in app.get_browsers ()) {
                 browser_added (browser);
             }

=== modified file 'extensions/tabby.vala'
--- extensions/tabby.vala	2013-11-19 19:30:54 +0000
+++ extensions/tabby.vala	2013-11-19 20:42:17 +0000
@@ -144,6 +144,11 @@
                 unowned GLib.List<unowned Katze.Item> u_items = items;
 
                 bool delay = false;
+                bool should_delay = false;
+
+                int load_on_startup;
+                APP.settings.get ("load-on-startup", out load_on_startup);
+                should_delay = load_on_startup == Midori.MidoriStartup.DELAYED_PAGES;
 
                 this.state = SessionState.RESTORING;
 
@@ -162,7 +167,7 @@
 
                             t_item.set_meta_integer ("append", 1);
 
-                            if (delay)
+                            if (delay && should_delay)
                                 t_item.set_meta_integer ("delay", Midori.Delay.DELAYED);
                             else
                                 delay = true;
@@ -643,7 +648,24 @@
     private class Manager : Midori.Extension {
         private Base.Storage storage;
         private bool load_session () {
-            this.storage.restore_last_sessions ();
+            /* Using get here to avoid MidoriMidoriStartup in generated C with Vala 0.20.1 */
+            int load_on_startup;
+            APP.settings.get ("load-on-startup", out load_on_startup);
+            if (load_on_startup == Midori.MidoriStartup.BLANK_PAGE) {
+                Midori.Browser browser = APP.create_browser ();
+                APP.add_browser (browser);
+                /* The API from the old days says blank but means speed dial */
+                browser.add_uri ("about:dial");
+                browser.show ();
+            } else if (load_on_startup == Midori.MidoriStartup.HOMEPAGE) {
+                Midori.Browser browser = APP.create_browser ();
+                APP.add_browser (browser);
+                browser.add_uri ("about:home");
+                browser.show ();
+            } else {
+                this.storage.restore_last_sessions ();
+            }
+
             return false;
         }
 
@@ -685,8 +707,14 @@
                 GLib.warning ("missing session");
             } else {
                 session.close ();
-                if (browser.destroy_with_parent) {
-                    /* remove js popup sessions */
+
+                /* Using get here to avoid MidoriMidoriStartup in generated C with Vala 0.20.1 */
+                int load_on_startup;
+                APP.settings.get ("load-on-startup", out load_on_startup);
+
+                if (browser.destroy_with_parent
+                 || load_on_startup < Midori.MidoriStartup.LAST_OPEN_PAGES) {
+                    /* Remove js popups and close if not restoring on startup */
                     session.remove ();
                 }
             }