Ticket #1341: dslo1341_2.patch

extensions/cpsection/keyboard/model.py

@@ -112 +112 @@
     def get_current_option_group(self):
         """Return the enabled option for switching keyboard group"""
         options = self._gconf_client.get_list(_OPTIONS_KEY, gconf.VALUE_STRING)
-        
         if not options:
             options = self._configrec.get_options()
 
@@ -128 +127 @@
 
     def set_model(self, model):
         """Sets the supplied keyboard model"""
+        if model is None:
+            self._gconf_client.set_string(_MODEL_KEY, '')
+            return
+
         self._gconf_client.set_string(_MODEL_KEY, model)
         self._configrec.set_model(model)
         self._configrec.activate(self._engine)
 
     def set_option_group(self, option_group):
         """Sets the supplied option for switching keyboard group"""
+        if option_group is None or option_group == '':
+            self._gconf_client.set_list(_OPTIONS_KEY, gconf.VALUE_STRING, [])
+            return
+
         #XXX: Merge, not overwrite previous options
         options = [option_group]
         self._gconf_client.set_list(_OPTIONS_KEY, gconf.VALUE_STRING, options)
@@ -142 +149 @@
 
     def set_layouts(self, layouts):
         """Sets the supplied keyboard layouts (with variants)"""
+        if layouts is None or layouts == []:
+            self._gconf_client.set_list(_LAYOUTS_KEY, gconf.VALUE_STRING, [])
+            return
+
         self._gconf_client.set_list(_LAYOUTS_KEY, gconf.VALUE_STRING, layouts)
         layouts_list = []
         variants_list = []

extensions/cpsection/keyboard/view.py

@@ -30 +30 @@
 ICON = 'module-keyboard'
 TITLE = _('Keyboard')
 
-_APPLY_TIMEOUT = 3000
+_APPLY_TIMEOUT = 500
 
 #TODO: This cpsection adds checks for xklavier in bin/sugar-session and
 #      src/jarabe/controlpanel/gui.py. We should get rid of these checks