[PATCH 2/4] Save layout switching configuration

Vratislav Podzimek vpodzime at redhat.com
Mon Oct 22 16:29:44 UTC 2012


Resolves: rhbz#864785

Signed-off-by: Vratislav Podzimek <vpodzime at redhat.com>
---
 pyanaconda/keyboard.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pyanaconda/keyboard.py b/pyanaconda/keyboard.py
index b3c84da..51d3959 100755
--- a/pyanaconda/keyboard.py
+++ b/pyanaconda/keyboard.py
@@ -121,10 +121,9 @@ def get_layouts_xorg_conf(keyboard):
         ret += '"' + ','.join(variants) + '"\n'
 
     #switching
-    #TODO: add option for switching combination
-    #for now, let's default to Alt+Shift
-    ret += '\tOption\t"XkbOptions"\t'
-    ret += '"grp:alt_shift_toggle"\n'
+    if any(keyboard.switch_options):
+        ret += '\tOption\t"XkbOptions"\t'
+        ret += '"' + ','.join(keyboard.switch_options) + '"\n'
 
     #section footer
     ret += 'EndSection'
-- 
1.7.11.7



More information about the anaconda-patches mailing list