From 2f7153776e271ad75c2df4197108fffaf77f3161 Mon Sep 17 00:00:00 2001 From: Daniel Drake Date: Thu, 06 Oct 2011 14:59:29 +0000 Subject: Only activate keyboard configuration if it was configured, OLPC #11175 Sugar is currently activing a new keyboard config even if the user did not change any settings. Avoid this by only activating the configuration if user-specified settings are found in gconf. Also remove the default 'evdev' model string so that gconf settings are truly blank unless the user has selected something. This fixes the case where keyboard settings were configured elsewhere, but Sugar ends up throwing those away and applying its own 'blank' settings. The forced 'evdev' default was added in #1717: Since we do not supply a keyboard model by default, xfree86 gets picked up, and as a result the arrow keys, etc do not work on Xephyr. We should use evdev instead. However, this seems more like an evdev configuration issue, and regardless of this, arrow keys are not working before this patch anyway. Acked-By: Sascha Silbe Signed-off-by: Daniel Drake --- (limited to 'data') diff --git a/data/sugar.schemas.in b/data/sugar.schemas.in index b13f746..8b3e1ad 100644 --- a/data/sugar.schemas.in +++ b/data/sugar.schemas.in @@ -232,7 +232,6 @@ /desktop/sugar/peripherals/keyboard/model sugar string - evdev Keyboard model The keyboard model to be used -- cgit v0.9.1