Merge lp:~tombeckmann/switchboard/cli-open-fixes into lp:~elementary-pantheon/switchboard/switchboard

[Tom Beckmann]

Initialize cheese-gtk before gtk, required for GNOME Control Center compatibility layer

This fixes the crash when opening a gcc plug via commandline, it was caused by the user-accounts plug requiring cheese-gtk to be initialized before gtk. We fix this by initializing cheese-gtk for it. A different solution would have been to have all plugins initialize themselves when switchboard starts, but this approach appears easier and better for performance.

The branch also introduces a translation from gcc plug names to switchboard plug names. The names are taken directly from gcc's source, so they are definitely correct and we can easily swap out our plugs if we replace gcc ones. As shnatsel already mentioned here https://bugs.launchpad.net/elementaryos/+bug/1291738/comments/5 the app that is calling switchboard shouldn't be concerned whether the plug that is opened is native or from gcc, this translation layer allows this behavior. A simple "switchboard sound" or "switchboard keyboard" will now open the corresponding plug, instead of a "switchboard -o hardware-gcc-sound" for example (but it continues to work of course), which would break for all third-parties using this, once we get a sound plug ourselves, as the "gcc" part would be replaced with "pantheon". So translating this centrally in switchboard is definitely the best option.

The gnome-control-center replacement script can now be reduced to basically this http://pastebin.com/BUTPJBNF which appears to work perfectly, including support for additional flags like --debug. I can propose a merge for this when this branch is accepted.

[lp:~tombeckmann/switchboard/cli-open-fixes]

460. By Tom Beckmann on 2014-07-06

fix whitespaces

[Tom Beckmann (tombeckmann)]

Oups, accidentally moved the translate function in the HAVE_UNITY conditional block. Will fix that once I get back to my computer in around 8h.

[lp:~tombeckmann/switchboard/cli-open-fixes]

461. By Tom Beckmann on 2014-07-07

move translation method out of HAVE_UNITY block

[Tom Beckmann (tombeckmann)]

As ricotz pointed out: https://git.gnome.org/browse/gnome-control-center/commit/?id=45d4944b6db031dbc77e515bdae0fac9dbdba50f Initializing cheese-gtk is apparently the way it's supposed to work now.

I fixed the HAVE_UNITY issue now.

[Sergey "Shnatsel" Davidoff (shnatsel)]

I'm not a fan of the way translation from short names like "sound" to fully-qualified names is done currently. As far as I understand this will require us to manually track upstream G-C-C plug list changes, which we would of course would like to avoid.

What I tried to do in BASH (and gave up) is to enumerate all existing plugs and then choose the appropriate one automatically, depending on the environment. So if I have e.g. both hardware-pantheon-sound and hardware-gcc-sound and a hypothetical hardware-xfce-sound installed and run "switchboard sound", it should infer the DE from XDG_CURRENT_DESKTOP environment variable (e.g. launch pantheon-sound in pantheon, gcc-sound in GNOME, etc) and fall back to pantheon plugs if no match is found.

I've tried to code that as a BASH wrapper and I could probably even do it if somebody explains me how to find all available plugs. Although working with XDG_DATA_DIRS is complicated in BASH, so I'd prefer to have it in Vala.

[Sergey "Shnatsel" Davidoff (shnatsel)]

review: Abstain

[Corentin Noël (tintou)]

Can you please add a note before the cheese-gtk dependency in CMake that we remember that it is needed by the gcc-compatibility-layer.
While this patch will work for Freya, I really want to push a new standard for settings opening (see https://docs.google.com/a/elementaryos.org/document/d/1N0uqNtVXEFn3cLgNMeN75mP_dpMpCco-7uw5PKow-_Q/edit?usp=sharing )

[lp:~tombeckmann/switchboard/cli-open-fixes]

462. By Tom Beckmann on 2014-07-08

add note to cmake about cheese dependency

[Corentin Noël (tintou)]

Okay, let's go ahead.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-03-17 19:18:13 +0000
+++ CMakeLists.txt	2014-07-08 15:13:36 +0000
@@ -95,6 +95,8 @@
   gmodule-2.0
   gtk+-3.0>=3.10
   gio-unix-2.0
+  # cheese is required for the GCC panels to work
+  cheese-gtk
 )
 find_package(PkgConfig)
 
@@ -140,4 +142,4 @@
 endif ()
 
 add_subdirectory (schemas)
-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/schemas/org.pantheon.switchboard.gschema.xml DESTINATION ${GSETTINGSDIR})
 \ No newline at end of file
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/schemas/org.pantheon.switchboard.gschema.xml DESTINATION ${GSETTINGSDIR})
 
=== modified file 'src/Switchboard.vala'
--- src/Switchboard.vala	2014-05-27 05:48:46 +0000
+++ src/Switchboard.vala	2014-07-08 15:13:36 +0000
@@ -17,6 +17,8 @@
 
 namespace Switchboard {
 
+    [CCode (cname = "cheese_gtk_init")]
+    public extern static bool cheese_gtk_init ([CCode (array_length_pos = 0.9)] ref unowned string[] argv);
 
     public enum WindowState {
         NORMAL = 0,
@@ -24,7 +26,11 @@
     }
 
     public static int main (string[] args) {
-        Gtk.init (ref args);
+
+        // FIXME the gcc user-accounts plug requires cheese to be initialized before gtk,
+        //       otherwise it will crash switchboard if it's loaded before the window and
+        //       all its widgets are displayed.
+        cheese_gtk_init (ref args);
 
         var app = new SwitchboardApp ();
         return app.run (args);
@@ -50,7 +56,7 @@
         private int default_width = 0;
         private int default_height = 0;
 
-		private static string? plug_to_open = null;
+        private static string? plug_to_open = null;
         private static bool should_animate_next_transition = true;
 
         static const OptionEntry[] entries = {
@@ -94,6 +100,11 @@
             try {
                 unowned string[] tmp = args;
                 context.parse (ref tmp);
+
+                // 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]);
+                }
             } catch (Error e) {
                 warning (e.message);
                 return 0;
@@ -439,6 +450,36 @@
             return (empty ? null : category_item);
         }
 #endif
+
+        private string? gcc_to_switchboard_code_name (string gcc_name) {
+            // list of names taken from GCC's shell/cc-panel-loader.c
+            switch (gcc_name) {
+                case "background": return "pantheon-desktop";
+                case "bluetooth": return "network-gcc-bluetooth";
+                case "color": return "hardware-gcc-color";
+                case "datetime": return "system-gcc-date";
+                case "display": return "hardware-gcc-display";
+                case "info": return "system-pantheon-about";
+                case "keyboard": return "hardware-pantheon-keyboard";
+                case "network": return "network-gcc-network";
+                case "power": return "system-pantheon-power";
+                case "printers": return "hardware-gcc-printer";
+                case "privacy": return "pantheon-security-privacy";
+                case "region": return "hardware-gcc-region";
+                case "sound": return "hardware-gcc-sound";
+                case "universal-access": return "system-gcc-universalaccess";
+                case "user-accounts": return "hardware-gcc-user";
+                case "wacom": return "hardware-gcc-wacom";
+
+                // not available on our system
+                case "notifications":
+                case "search":
+                case "sharing":
+                    return null;
+            }
+
+            return null;
+        }
     }
 }