[gnome-settings-daemon] wacom: Remove the only tool setting left

[Bastien Nocera <hadess src gnome org>]

commit 095b132d2665b258e9aac41c1d23d2f367c932fd
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Nov 22 17:45:59 2011 +0000

    wacom: Remove the only tool setting left
    
    The only setting that the PAD was using that wasn't global.

 ...ings-daemon.peripherals.wacom.gschema.xml.in.in |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)
---
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 b373eb8..c2b06cb 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
@@ -14,7 +14,6 @@
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.peripherals.wacom" path="/org/gnome/settings-daemon/peripherals/wacom/">
     <child name="stylus" schema="org.gnome.settings-daemon.peripherals.wacom.stylus"/>
     <child name="eraser" schema="org.gnome.settings-daemon.peripherals.wacom.eraser"/>
-    <child name="pad" schema="org.gnome.settings-daemon.peripherals.wacom.pad"/>
 
     <!-- is-absolute applies to all tools but PAD -->
     <key name="is-absolute" type="b">
@@ -42,6 +41,12 @@
       <_summary>Wacom tablet PC feature</_summary>
       <_description>Enable this to only report stylus events when the tip is pressed.</_description>
     </key>
+    <!-- Applies only to the PAD tool -->
+    <key name="pad-buttonmapping" type="ai">
+      <default>[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]</default>
+      <_summary>Wacom pad button mapping</_summary>
+      <_description>Set this to the logical button mapping.</_description>
+    </key>
   </schema>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.peripherals.wacom.stylus" path="/org/gnome/settings-daemon/peripherals/wacom/stylus/">
     <key name="pressurecurve" type="ai">
@@ -77,11 +82,4 @@
       <_description>Set this to the pressure value at which an eraser click event is generated.</_description>
     </key>
   </schema>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.peripherals.wacom.pad" path="/org/gnome/settings-daemon/peripherals/wacom/pad/">
-    <key name="buttonmapping" type="ai">
-      <default>[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]</default>
-      <_summary>Wacom pad button mapping</_summary>
-      <_description>Set this to the logical button mapping.</_description>
-    </key>
-  </schema>
 </schemalist>