Merge lp:~madsa/switchboard/switchboard-fix-1586631 into lp:~elementary-pantheon/switchboard/switchboard

[Matt Spaulding]

Support opening specific plug window from command line

[Santiago (santileortiz)]

I think the documentation should be updated to show that using <plug_name>:<keyword> will call the plug as if <keyword> was searched on switchboard.

[Santiago (santileortiz)]

review: Approve

=== modified file 'src/Switchboard.vala'
--- src/Switchboard.vala	2016-07-30 19:05:42 +0000
+++ src/Switchboard.vala	2016-09-26 03:11:09 +0000
@@ -53,6 +53,7 @@
         private int default_height = 0;
 
         private static string? plug_to_open = null;
+        private static string? open_window  = null;
         private static bool opened_directly = false;
         private static bool should_animate_next_transition = true;
         private const uint[] NAVIGATION_KEYS = {
@@ -118,7 +119,13 @@
 
                 // we have an unparsed argument. Assume that it's a gcc plug name
                 if (tmp.length > 1) {
-                    plug_to_open = gcc_to_switchboard_code_name (tmp[1]);
+                    if (":" in tmp[1]) {
+                        var parts = tmp[1].split (":");
+                        plug_to_open = gcc_to_switchboard_code_name (parts[0]);
+                        open_window  = parts[1];
+                    } else {
+                        plug_to_open = gcc_to_switchboard_code_name (tmp[1]);
+                    }
                 }
             } catch (Error e) {
                 warning (e.message);
@@ -215,6 +222,12 @@
                 headerbar.title = plug.display_name;
                 current_plug = plug;
 
+                // open window was set by command line argument
+                if (open_window != null) {
+                    plug.search_callback (open_window); 
+                    open_window = null;
+                }
+
                 switch_to_plug (plug);
                 return false;
             }, priority);