[gnome-settings-daemon] Add shortcut to start gnome-control-center

[Christophe Fergeau <teuf src gnome org>]

commit b4668fa58e6048cdd10aacebd0bd513ae132364d
Author: Christophe Fergeau <cfergeau redhat com>
Date:   Sat Apr 26 12:34:20 2014 +0200

    Add shortcut to start gnome-control-center
    
    This is bound by default to XF86Tools

 ...ngs-daemon.plugins.media-keys.gschema.xml.in.in |    5 +++++
 plugins/media-keys/gsd-media-keys-manager.c        |    5 ++++-
 plugins/media-keys/media-keys.h                    |    1 +
 plugins/media-keys/shortcuts-list.h                |    1 +
 4 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in 
b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
index 68926cb..aa8760c 100644
--- a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
@@ -15,6 +15,11 @@
       <_summary>Launch calculator</_summary>
       <_description>Binding to launch the calculator.</_description>
     </key>
+    <key name="control-center" type="s">
+      <default>'XF86Tools'</default>
+      <_summary>Launch settings</_summary>
+      <_description>Binding to launch GNOME settings.</_description>
+    </key>
     <key name="email" type="s">
       <default>'XF86Mail'</default>
       <_summary>Launch email client</_summary>
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index 08c68d2..fba3fd3 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -968,7 +968,7 @@ do_execute_desktop_or_desktop (GsdMediaKeysManager *manager,
         GDesktopAppInfo *app_info;
 
         app_info = g_desktop_app_info_new (desktop);
-        if (app_info == NULL)
+        if (app_info == NULL && alt_desktop != NULL)
                 app_info = g_desktop_app_info_new (alt_desktop);
 
         if (app_info != NULL) {
@@ -2102,6 +2102,9 @@ do_action (GsdMediaKeysManager *manager,
         case CALCULATOR_KEY:
                 do_execute_desktop_or_desktop (manager, "gcalctool.desktop", "gnome-calculator.desktop", 
timestamp);
                 break;
+        case CONTROL_CENTER_KEY:
+                do_execute_desktop_or_desktop (manager, "gnome-control-center.desktop", NULL, timestamp);
+                break;
         case PLAY_KEY:
                 return do_multimedia_player_action (manager, "Play");
         case PAUSE_KEY:
diff --git a/plugins/media-keys/media-keys.h b/plugins/media-keys/media-keys.h
index e32425e..dd1ffd2 100644
--- a/plugins/media-keys/media-keys.h
+++ b/plugins/media-keys/media-keys.h
@@ -37,6 +37,7 @@ typedef enum {
         CALCULATOR_KEY,
         SEARCH_KEY,
         EMAIL_KEY,
+        CONTROL_CENTER_KEY,
         SCREENSAVER_KEY,
         HELP_KEY,
         SCREENSHOT_KEY,
diff --git a/plugins/media-keys/shortcuts-list.h b/plugins/media-keys/shortcuts-list.h
index d32edfc..20e1c9d 100644
--- a/plugins/media-keys/shortcuts-list.h
+++ b/plugins/media-keys/shortcuts-list.h
@@ -58,6 +58,7 @@ static struct {
         { CALCULATOR_KEY, "calculator", NULL, NULL, GSD_KEYBINDING_MODE_LAUNCHER },
         { SEARCH_KEY, "search", NULL, NULL, GSD_KEYBINDING_MODE_LAUNCHER },
         { EMAIL_KEY, "email", NULL, NULL, GSD_KEYBINDING_MODE_LAUNCHER },
+        { CONTROL_CENTER_KEY, "control-center", NULL, NULL, GSD_KEYBINDING_MODE_LAUNCHER },
         { SCREENSAVER_KEY, "screensaver", NULL, NULL, SCREENSAVER_MODE },
         { SCREENSAVER_KEY, NULL, N_("Lock Screen"), "XF86ScreenSaver", SCREENSAVER_MODE },
         { HELP_KEY, "help", NULL, NULL, GSD_KEYBINDING_MODE_LAUNCHER },