[PATCH 3/3] Save a reference to the imported Xkl module for get_current_layout

David Shea dshea at redhat.com
Mon Dec 2 15:25:51 UTC 2013


---
 pyanaconda/keyboard.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pyanaconda/keyboard.py b/pyanaconda/keyboard.py
index 0fe7d6e..9914313 100644
--- a/pyanaconda/keyboard.py
+++ b/pyanaconda/keyboard.py
@@ -395,6 +395,8 @@ class XklWrapper(object):
     def __init__(self):
         from gi.repository import GdkX11, Xkl
 
+        self._xkl = Xkl
+
         #initialize Xkl-related stuff
         display = GdkX11.x11_get_default_xdisplay()
         self._engine = Xkl.Engine.get_instance(display)
@@ -494,7 +496,7 @@ class XklWrapper(object):
         """
         # ported from the widgets/src/LayoutIndicator.c code
 
-        self._engine.start_listen(Xkl.EngineListenModes.TRACK_KEYBOARD_STATE)
+        self._engine.start_listen(self._xkl.EngineListenModes.TRACK_KEYBOARD_STATE)
         state = self._engine.get_current_state()
         cur_group = state.group
         num_groups = self._engine.get_num_groups()
@@ -511,7 +513,7 @@ class XklWrapper(object):
             # X server may have forgotten to add the "" variant for its default layout
             variant = ""
 
-        self._engine.stop_listen(Xkl.EngineListenModes.TRACK_KEYBOARD_STATE)
+        self._engine.stop_listen(self._xkl.EngineListenModes.TRACK_KEYBOARD_STATE)
 
         return _join_layout_variant(layout, variant)
 
-- 
1.8.4.2



More information about the anaconda-patches mailing list