Merge lp:~ivaldi/midori/tabby-execute-commands into lp:midori

[André Stösel]

execute commands given at start time

[André Stösel (ivaldi)]

Right now there is no trivial fix for the event order -> FIXME

[Paweł Forysiuk (tuxator)]

review: Approve

=== modified file 'extensions/tabby.vala'
--- extensions/tabby.vala	2013-11-19 22:00:40 +0000
+++ extensions/tabby.vala	2013-12-04 17:39:44 +0000
@@ -666,6 +666,20 @@
                 this.storage.restore_last_sessions ();
             }
 
+            /* FIXME: execute_commands should be called before session creation */
+            GLib.Idle.add (this.execute_commands);
+
+            return false;
+        }
+
+        private bool execute_commands () {
+            Midori.App app = this.get_app ();
+            unowned string?[] commands = app.get_data ("execute-commands");
+
+            if (commands != null) {
+                app.send_command (commands);
+            }
+
             return false;
         }
 

=== modified file 'midori/midori.vapi'
--- midori/midori.vapi	2013-11-19 19:30:54 +0000
+++ midori/midori.vapi	2013-12-04 17:39:44 +0000
@@ -31,6 +31,8 @@
         public static void set_instance_is_running (bool is_running);
         public Browser create_browser ();
         public GLib.List<weak Browser> get_browsers ();
+        public void send_notification (string title, string message);
+        public bool send_command ([CCode (array_length = false)] string[] command);
 
         [NoAccessorMethod]
         public string name { get; set; }
@@ -55,7 +57,6 @@
         public signal void remove_browser (Browser browser);
         [HasEmitter]
         public signal void quit ();
-        public void send_notification (string title, string message);
     }
 
     [CCode (cheader_filename = "midori/midori.h")]