Merge lp:~tigrangab/slingshot/testing-startup-time into lp:~elementary-pantheon/slingshot/trunk

[Tigran Gabrielyan]

Only use OptionContext parser if we have args to avoid slow down in startup time to fix bug #1043689.

[lp:~tigrangab/slingshot/testing-startup-time]

368. By Tigran Gabrielyan on 2013-08-12

Only use OptionContext parser if we have args to avoid slow down in startup time

[David Gomes (davidgomes)]

Code style fixes:

Add a newline after "context.add_group (Gtk.get_option_group (true));"
var context = new OptionContext(""); → var context = new OptionContext ("");
context.parse(ref args); → context.parse (ref args);
print(e.message + "\n"); → print (e.message + "\n");
Cuddle the try/catch blog so it'll be } catch {

This will need to be tested on Pantheon, seen as I can't run Pantheon I can't test it, but somebody will have to before it gets merged.

review: Needs Fixing

[lp:~tigrangab/slingshot/testing-startup-time]

369. By Tigran Gabrielyan on 2013-08-12

Fix coding style

370. By Tigran Gabrielyan on 2013-08-12

Fix coding style

[Julián Unrrein (junrrein)]

I did some quick testing, but I can preliminarily say that the speed bump when opening slingshot is impressive!
I can't believe something so simple has such an effect.

[Cody Garver (codygarver)]

This merge will prompt a new stable release of Slingshot

[Cody Garver (codygarver)]

I tried to break it. I failed.

review: Approve

=== modified file 'src/Slingshot.vala'
--- src/Slingshot.vala	2013-01-09 16:31:38 +0000
+++ src/Slingshot.vala	2013-08-12 22:48:00 +0000
@@ -62,9 +62,7 @@
         }
 
         public Slingshot () {
-
             settings = new Settings ();
-
         }
 
         protected override void activate () {
@@ -86,7 +84,6 @@
                     view.show_slingshot ();
             }
             silent = false;
-
         }
 
         static const OptionEntry[] entries = {
@@ -96,21 +93,21 @@
         };
 
         public static int main (string[] args) {
-
-            var context = new OptionContext("");
-            context.add_main_entries(entries, "slingshot");
-            context.add_group (Gtk.get_option_group (true));
-            try {
-                context.parse(ref args);
-            }
-            catch(Error e) {
-                print(e.message + "\n");
-            }
-
+            if (args.length > 1) {
+                var context = new OptionContext ("");
+                context.add_main_entries (entries, "slingshot");
+                context.add_group (Gtk.get_option_group (true));
+                
+                try {
+                    context.parse (ref args);
+                } catch (Error e) {
+                    print (e.message + "\n");
+                }
+            }
+            
             var app = new Slingshot ();
 
             return app.run (args);
-
         }
 
     }