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

[Christophe Fergeau <teuf src gnome org>]

commit 062ad6d7273256c503f02d5938db2f3623e3d817
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

 plugins/media-keys/gsd-media-keys-manager.c |    5 ++++-
 plugins/media-keys/shortcuts-list.h         |    2 ++
 2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index 9604aed..71f45a0 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -959,7 +959,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) {
@@ -2091,6 +2091,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/shortcuts-list.h b/plugins/media-keys/shortcuts-list.h
index 1e87dd7..a413dd0 100644
--- a/plugins/media-keys/shortcuts-list.h
+++ b/plugins/media-keys/shortcuts-list.h
@@ -41,6 +41,7 @@ typedef enum {
         CALCULATOR_KEY,
         SEARCH_KEY,
         EMAIL_KEY,
+        CONTROL_CENTER_KEY,
         SCREENSAVER_KEY,
         HELP_KEY,
         SCREENSHOT_KEY,
@@ -123,6 +124,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, NULL, NULL, "XF86Tools", 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 },