[gsettings-desktop-schemas] schemas: Scroll method key changes

[Bastien Nocera <hadess src gnome org>]

commit 656aca6942c8417ddb3216063b97b7a1336076c9
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Dec 10 16:02:54 2015 +0100

    schemas: Scroll method key changes
    
    Following the Mouse & Touchpad changes in GNOME 3.19, remove the
    'scroll-method' key, and add the 'edge-scrolling-enabled' key.
    
    When disabled, touchpads that only support edge scrolling (and not
    2-finger scrolling) will have that feature disabled.
    
    See https://bugzilla.gnome.org/show_bug.cgi?id=759304
    
    https://bugzilla.gnome.org/show_bug.cgi?id=759305

 headers/gdesktop-enums.h                           |    7 -------
 .../org.gnome.desktop.peripherals.gschema.xml.in   |    8 ++++----
 2 files changed, 4 insertions(+), 11 deletions(-)
---
diff --git a/headers/gdesktop-enums.h b/headers/gdesktop-enums.h
index 8386f61..2ddca49 100644
--- a/headers/gdesktop-enums.h
+++ b/headers/gdesktop-enums.h
@@ -164,13 +164,6 @@ typedef enum
 
 typedef enum
 {
-  G_DESKTOP_TOUCHPAD_SCROLL_METHOD_DISABLED,
-  G_DESKTOP_TOUCHPAD_SCROLL_METHOD_EDGE_SCROLLING,
-  G_DESKTOP_TOUCHPAD_SCROLL_METHOD_TWO_FINGER_SCROLLING
-} GDesktopTouchpadScrollMethod;
-
-typedef enum
-{
   G_DESKTOP_TOUCHPAD_HANDEDNESS_RIGHT,
   G_DESKTOP_TOUCHPAD_HANDEDNESS_LEFT,
   G_DESKTOP_TOUCHPAD_HANDEDNESS_MOUSE
diff --git a/schemas/org.gnome.desktop.peripherals.gschema.xml.in 
b/schemas/org.gnome.desktop.peripherals.gschema.xml.in
index ff417db..9f109ef 100644
--- a/schemas/org.gnome.desktop.peripherals.gschema.xml.in
+++ b/schemas/org.gnome.desktop.peripherals.gschema.xml.in
@@ -8,10 +8,10 @@
     <child name="touchscreen" schema="org.gnome.desktop.peripherals.touchscreen"/>
   </schema>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.desktop.peripherals.touchpad" 
path="/org/gnome/desktop/peripherals/touchpad/">
-    <key name="scroll-method" enum="org.gnome.desktop.GDesktopTouchpadScrollMethod">
-      <default>'two-finger-scrolling'</default>
-      <summary>Select the touchpad scroll method</summary>
-      <description>Select the touchpad scroll method. Supported values are: "disabled", "edge-scrolling", 
"two-finger-scrolling".</description>
+    <key name="edge-scrolling-enabled" type="b">
+      <default>true</default>
+      <summary>Whether edge scrolling is enabled</summary>
+      <description>When disabled, touchpads that only support edge scrolling (and not 2-finger scrolling) 
will have that feature disabled.</description>
     </key>
     <key name="tap-to-click" type="b">
       <default>false</default>