Merge lp:~ivaldi/midori/tabby-restore-count into lp:midori

[André Stösel]

option to modify the number of tabs which will be restored in each idle callback

[Cris Dywan (kalikiana)]

To be blunt I'm not keen on telling users to tweak this kind of thing. Feedback from many users had to do with under-using session capabilities because they're confused by the settings and this probably is even harder to make good use of.
I would like to hear another opinion on this. Personally I'd prefer just slightly raising the number but without making it configurable.

review: Needs Information

[lp:~ivaldi/midori/tabby-restore-count]

6401. By André Stösel on 2013-10-06

merge lp:midori

6402. By André Stösel on 2013-10-06

set IdleRestoreCount to 12

[Paweł Forysiuk (tuxator)]

I am fine with this being a hidden setting (i think there is no user facing gui for this).
Could be handy for tweaking and testing purposes and code is not that intrusive imho.

review: Approve

[André Stösel (ivaldi)]

The idea is that someone who has a problem with the default setting (low end arm system) can change it. There is no UI for this -> the user won't be bothered with this setting until he reads the FAQ (some sort of tuning or problem solving section)

[Cris Dywan (kalikiana)]

So how about an environment variable? For testing I find that much easier than looking for a file to edit.

review: Needs Fixing

[lp:~ivaldi/midori/tabby-restore-count]

6403. By André Stösel on 2013-10-17

merge lp:midori

6404. By André Stösel on 2013-10-17

use env to change the restore count instead of an extension property

[André Stösel (ivaldi)]

review: Needs Resubmitting

[André Stösel (ivaldi)]

Oops, I thought resubmit would trigger a new review message but it doesn't.
("review resubmit - tell the developer to rework the change")

review: Approve

[Cris Dywan (kalikiana)]

I think it's intended the other way around - a broad hint from the reviewer to the developer.

Looks good! Was thinking a bit about the =0 case but doesn't really matter much, it's aimed at testing anyway.

review: Approve

=== modified file 'extensions/tabby.vala'
--- extensions/tabby.vala	2013-10-15 18:12:34 +0000
+++ extensions/tabby.vala	2013-10-17 21:52:37 +0000
@@ -10,6 +10,8 @@
 */
 
 namespace Tabby {
+    int IDLE_RESTORE_COUNT = 13;
+
     /* function called from Manager object */
     public interface IStorage : GLib.Object {
         public abstract Katze.Array get_sessions ();
@@ -144,7 +146,7 @@
                     /* Note: we need to use `items` for something to maintain a valid reference */
                     GLib.PtrArray new_tabs = new GLib.PtrArray ();
                     if (items.length () > 0) {
-                        for (int i = 0; i < 3; i++) {
+                        for (int i = 0; i < IDLE_RESTORE_COUNT; i++) {
                             if (u_items == null) {
                                 this.helper_reorder_tabs (new_tabs);
                                 this.state = SessionState.OPEN;
@@ -641,6 +643,14 @@
         }
 
         private void activated (Midori.App app) {
+            unowned string? restore_count = GLib.Environment.get_variable ("TABBY_RESTORE_COUNT");
+            if (restore_count != null) {
+                int count = int.parse (restore_count);
+                if (count >= 1) {
+                    IDLE_RESTORE_COUNT = count;
+                }
+            }
+
             /* FixMe: provide an option to replace Local.Storage with IStorage based Objects */
             this.storage = new Local.Storage (this.get_app ()) as Base.Storage;
 
@@ -657,7 +667,7 @@
                          version: "0.1",
                          authors: "André Stösel <[e-mail]>");
 
-            activate.connect (this.activated);
+            this.activate.connect (this.activated);
         }
     }
 }