[gnome-settings-daemon] wacom: Add storage for custom action elevator buttons

[Bastien Nocera <hadess src gnome org>]

commit bdfe5fb4354c23222de7e652ccf5cc5d7bf093cd
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Feb 27 18:53:30 2012 +0000

    wacom: Add storage for custom action elevator buttons
    
    We need an action for up and an action for down, for the buttons.

 ...dia-keys-Remove-unused-allowed-keys-entry.patch |   29 ++++++++++++++++++++
 ...ings-daemon.peripherals.wacom.gschema.xml.in.in |    5 +++
 2 files changed, 34 insertions(+), 0 deletions(-)
---
diff --git a/data/0001-media-keys-Remove-unused-allowed-keys-entry.patch b/data/0001-media-keys-Remove-unused-allowed-keys-entry.patch
new file mode 100644
index 0000000..280cc2b
--- /dev/null
+++ b/data/0001-media-keys-Remove-unused-allowed-keys-entry.patch
@@ -0,0 +1,29 @@
+From d9ee620115e27696a77efa73da9d48b8b4925364 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess hadess net>
+Date: Thu, 20 Oct 2011 10:36:16 +0100
+Subject: [PATCH] media-keys: Remove unused allowed-keys entry
+
+Unused by the media-keys plugin.
+---
+ ...ngs-daemon.plugins.media-keys.gschema.xml.in.in |    5 -----
+ 1 files changed, 0 insertions(+), 5 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 87c7249..85438c5 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
+@@ -5,11 +5,6 @@
+       <_summary>Activation of this plugin</_summary>
+       <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
+     </key>
+-    <key name="allowed-keys" type="as">
+-      <default>[]</default>
+-      <_summary>Allowed keys</_summary>
+-      <_description>If non-empty, keybindings will be ignored unless their settings directory is in the list. This is useful for lockdown.</_description>
+-    </key>
+     <key name="calculator" type="s">
+       <default>'XF86Calculator'</default>
+       <_summary>Launch calculator</_summary>
+-- 
+1.7.6.4
+
diff --git a/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in b/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
index 5ae8bc3..981d9ad 100644
--- a/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
@@ -92,5 +92,10 @@
       <_summary>Key combination for the custom action</_summary>
       <_description>The keyboard shortcut generated when the button is pressed for custom actions.</_description>
     </key>
+    <key name="custom-elevator-action" type="as">
+      <default>['', '']</default>
+      <_summary>Key combinations for an elevator custom action</_summary>
+      <_description>The keyboard shortcuts generated when a touchring or touchstrip is used for custom actions (up followed by down).</_description>
+    </key>
   </schema>
 </schemalist>