~ps-jenkins/unity-settings-daemon/ubuntu-vivid-proposed

Index: gnome-settings-daemon-3.8.5/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in

===================================================================

--- gnome-settings-daemon-3.8.5.orig/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in        2013-11-12 16:32:37.466469600 +1300

+++ gnome-settings-daemon-3.8.5/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in     2013-11-12 16:32:37.462469600 +1300

@@ -130,6 +130,11 @@

       <_summary>Copy a screenshot of an area to clipboard</_summary>

       <_description>Binding to copy a screenshot of an area to clipboard.</_description>

     </key>

+    <key name="terminal" type="s">

+      <default>'&lt;Primary&gt;&lt;Alt&gt;t'</default>

+      <_summary>Launch terminal</_summary>

+      <_description>Binding to launch the terminal.</_description>

+    </key>

     <key name="www" type="s">

       <default>'XF86WWW'</default>

       <_summary>Launch web browser</_summary>

Index: gnome-settings-daemon-3.8.5/plugins/media-keys/gsd-media-keys-manager.c

===================================================================

--- gnome-settings-daemon-3.8.5.orig/plugins/media-keys/gsd-media-keys-manager.c        2013-11-12 16:32:37.466469600 +1300

+++ gnome-settings-daemon-3.8.5/plugins/media-keys/gsd-media-keys-manager.c     2013-11-12 16:32:37.462469600 +1300

@@ -971,6 +971,22 @@

 }

 

 static void

+do_terminal_action (GsdMediaKeysManager *manager)

+{

+        GSettings *settings;

+        char *term;

+

+        settings = g_settings_new ("org.gnome.desktop.default-applications.terminal");

+        term = g_settings_get_string (settings, "exec");

+

+        if (term)

+        execute (manager, term, FALSE);

+

+        g_free (term);

+        g_object_unref (settings);

+}

+

+static void

 gnome_session_shutdown (GsdMediaKeysManager *manager)

 {

        GError *error = NULL;

@@ -2222,6 +2238,9 @@

         case AREA_SCREENSHOT_CLIP_KEY:

                 gsd_screenshot_take (type);

                 break;

+        case TERMINAL_KEY:

+                do_terminal_action (manager);

+                break;

         case WWW_KEY:

                 do_url_action (manager, "http", timestamp);

                 break;

Index: gnome-settings-daemon-3.8.5/plugins/media-keys/shortcuts-list.h

===================================================================

--- gnome-settings-daemon-3.8.5.orig/plugins/media-keys/shortcuts-list.h        2013-11-12 16:32:37.466469600 +1300

+++ gnome-settings-daemon-3.8.5/plugins/media-keys/shortcuts-list.h     2013-11-12 16:32:37.462469600 +1300

@@ -51,6 +51,7 @@

         SCREENSHOT_CLIP_KEY,

         WINDOW_SCREENSHOT_CLIP_KEY,

         AREA_SCREENSHOT_CLIP_KEY,

+        TERMINAL_KEY,

         WWW_KEY,

         PLAY_KEY,

         PAUSE_KEY,

@@ -122,6 +123,7 @@

         { SCREENSHOT_CLIP_KEY, "screenshot-clip", NULL, NULL, SHELL_KEYBINDING_MODE_ALL },

         { WINDOW_SCREENSHOT_CLIP_KEY, "window-screenshot-clip", NULL, NULL, SHELL_KEYBINDING_MODE_NORMAL },

         { AREA_SCREENSHOT_CLIP_KEY, "area-screenshot-clip", NULL, NULL, SHELL_KEYBINDING_MODE_ALL },

+        { TERMINAL_KEY, "terminal", NULL, NULL, GSD_KEYBINDING_MODE_LAUNCHER },

         { WWW_KEY, "www", NULL, NULL, GSD_KEYBINDING_MODE_LAUNCHER },

         { PLAY_KEY, "play", NULL, NULL, SHELL_KEYBINDING_MODE_ALL },

         { PAUSE_KEY, "pause", NULL, NULL, SHELL_KEYBINDING_MODE_ALL },