From 26eceffe5ea17df10e32d29f6fcd44ea50571d0f Mon Sep 17 00:00:00 2001
From: Jeremy Katz <katzj@redhat.com>
Date: Thu, 22 May 2003 15:34:32 +0000
Subject: update for change in redhat-config-keyboard api.  *sigh*

---
 dispatch.py            | 2 +-
 textw/keyboard_text.py | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dispatch.py b/dispatch.py
index c9446ccc0..97b5aac60 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -57,7 +57,7 @@ installSteps = [
     ("welcome", ("id.configFileData",)),
     ("betanag", betaNagScreen, ("intf", "dir")),
     ("language", ("intf", "id.instLanguage")),
-    ("keyboard", ("id.instLanguage.getDefaultKeyboard()", "id.keyboard", "id.xsetup")),
+    ("keyboard", ("id.instLanguage.getDefaultKeyboard()", "id.keyboard")),
     ("mouse", ("id.mouse",)),
     ("checkmonitorok", checkMonitorOK, ("id.monitor", "dispatch")),
     ("monitor", ("id.xsetup", "id.monitor", "intf")),
diff --git a/textw/keyboard_text.py b/textw/keyboard_text.py
index 655e4fafe..0e65068ff 100644
--- a/textw/keyboard_text.py
+++ b/textw/keyboard_text.py
@@ -21,7 +21,7 @@ from rhpl.log import log
 from rhpl.translate import _
 
 class KeyboardWindow:
-    def __call__(self, screen, defaultByLang, kbd, xconfig):
+    def __call__(self, screen, defaultByLang, kbd):
 	if flags.serial:
 	    return INSTALL_NOOP
         keyboards = kbd.modelDict.keys()
@@ -45,8 +45,6 @@ class KeyboardWindow:
 	kbd.beenset = 1
 
         kbd.activate()
-##         if (xconfig != (None, None)) and (xconfig != None):
-##             apply(xconfig.setKeyboard, kbd.getXKB())
 
         # FIXME: eventually, kbd.activate will do this
 	try:
-- 
cgit