diff options
author | Bastien Nocera <hadess@hadess.net> | 2010-10-08 15:37:35 +0100 |
---|---|---|
committer | Bastien Nocera <hadess@hadess.net> | 2010-10-08 15:37:35 +0100 |
commit | d3426f0a8ae5beed217d0bc5d1ce8325ca3d7250 (patch) | |
tree | 0100720cdced12c2ad105949c5534d8727d971b6 /data | |
parent | 2f35ee1515d5195f537e8aab7a85b51b69f2d348 (diff) | |
download | gnome-settings-daemon-d3426f0a8ae5beed217d0bc5d1ce8325ca3d7250.tar.gz |
Fix peripherals schema to validate
Diffstat (limited to 'data')
-rw-r--r-- | data/gsd-enums.h | 14 | ||||
-rw-r--r-- | data/org.gnome.desktop.peripherals.gschema.xml.in.in | 12 |
2 files changed, 20 insertions, 6 deletions
diff --git a/data/gsd-enums.h b/data/gsd-enums.h index d131ffe6..80d235a4 100644 --- a/data/gsd-enums.h +++ b/data/gsd-enums.h @@ -47,4 +47,18 @@ typedef enum GSD_FONT_RGBA_ORDER_VBGR } GsdFontRgbaOrder; +typedef enum +{ + GSD_SMARTCARD_REMOVAL_ACTION_NONE, + GSD_SMARTCARD_REMOVAL_ACTION_LOCK_SCREEN, + GSD_SMARTCARD_REMOVAL_ACTION_FORCE_LOGOUT +} GsdSmartcardRemovalAction; + +typedef enum +{ + GSD_TOUCHPAD_SCROLL_METHOD_DISABLED, + GSD_TOUCHPAD_SCROLL_METHOD_EDGE_SCROLLING, + GSD_TOUCHPAD_SCROLL_METHOD_TWO_FINGER_SCROLLING +} GsdTouchpadScrollMethod; + #endif /* __gsd_enums_h__ */ diff --git a/data/org.gnome.desktop.peripherals.gschema.xml.in.in b/data/org.gnome.desktop.peripherals.gschema.xml.in.in index 0d49fe43..4cced994 100644 --- a/data/org.gnome.desktop.peripherals.gschema.xml.in.in +++ b/data/org.gnome.desktop.peripherals.gschema.xml.in.in @@ -4,10 +4,10 @@ <child name="touchpad" schema="org.gnome.desktop.peripherals.touchpad"/> </schema> <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.desktop.peripherals.smartcard" path="/desktop/gnome/peripherals/smartcard/"> - <key name="removal-action" type="s"> - <default>none</default> + <key name="removal-action" enum="org.gnome.desktop.GsdSmartcardRemovalAction"> + <default>'none'</default> <_summary>Smartcard removal action</_summary> - <_description>Set this to one of "none", "lock_screen", or "force_logout". The action will get performed when the smartcard used for log in is removed.</_description> + <_description>Set this to one of "none", "lock-screen", or "force-logout". The action will get performed when the smartcard used for log in is removed.</_description> </key> </schema> <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.desktop.peripherals.touchpad" path="/desktop/gnome/peripherals/touchpad/"> @@ -21,10 +21,10 @@ <_summary>Enable horizontal scrolling</_summary> <_description>Set this to TRUE to allow horizontal scrolling by the same method selected with the scroll_method key.</_description> </key> - <key name="scroll-method" type="i"> - <default>1</default> + <key name="scroll-method" enum="org.gnome.desktop.GsdTouchpadScrollMethod"> + <default>'edge-scrolling'</default> <_summary>Select the touchpad scroll method</_summary> - <_description>Select the touchpad scroll method. Supported values are: 0: disabled, 1: edge scrolling, and 2: two-finger scrolling</_description> + <_description>Select the touchpad scroll method. Supported values are: "disabled", "edge-scrolling", "two-finger-scrolling".</_description> </key> <key name="tap-to-click" type="b"> <default>false</default> |