diff options
| author | Sascha Silbe <sascha-pgp@silbe.org> | 2010-05-31 14:52:23 (GMT) |
|---|---|---|
| committer | Tomeu Vizoso <tomeu.vizoso@collabora.co.uk> | 2010-06-02 14:55:40 (GMT) |
| commit | a85a8b7b654882219cf9d891f1b919790e2598a3 (patch) | |
| tree | 6962d81dad5659c4257729875475b508de5460e5 | |
| parent | d6ebfcbb4d93610bf30df517fcd5360fdd083b50 (diff) | |
keyboard cpsection: don't choke on option group (SL#2022)
Don't wrap the option group in another list if it's already a list.
Signed-off-by: Sascha Silbe <sascha-pgp@silbe.org>
| -rw-r--r-- | extensions/cpsection/keyboard/model.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/extensions/cpsection/keyboard/model.py b/extensions/cpsection/keyboard/model.py index 9d61c0c..089c2ea 100644 --- a/extensions/cpsection/keyboard/model.py +++ b/extensions/cpsection/keyboard/model.py @@ -142,8 +142,10 @@ class KeyboardManager(object): def set_option_group(self, option_group): """Sets the supplied option for switching keyboard group""" #XXX: Merge, not overwrite previous options - if option_group is None or not option_group: + if not option_group: options = [''] + elif isinstance(option_group, list): + options = option_group else: options = [option_group] self._gconf_client.set_list(_OPTIONS_KEY, gconf.VALUE_STRING, options) |