summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xgui.py6
-rw-r--r--textw/keyboard_text.py2
-rw-r--r--textw/welcome_text.py2
3 files changed, 7 insertions, 3 deletions
diff --git a/gui.py b/gui.py
index 143171d5b..5cf017dcb 100755
--- a/gui.py
+++ b/gui.py
@@ -735,7 +735,11 @@ class InstallControlWindow:
print _("Unable to load title bar")
- self.loadReleaseNotes()
+ if not flags.reconfig:
+ self.loadReleaseNotes()
+ else:
+ self.buff = ""
+
vbox.set_spacing(0)
diff --git a/textw/keyboard_text.py b/textw/keyboard_text.py
index f7afc64ab..115903996 100644
--- a/textw/keyboard_text.py
+++ b/textw/keyboard_text.py
@@ -43,7 +43,7 @@ class KeyboardWindow:
kbd.set (keyboards[choice])
kbd.beenset = 1
- if (xconfig != (None, None)):
+ if (xconfig != (None, None)) and (xconfig != None):
apply(xconfig.setKeyboard, kbd.getXKB())
if flags.reconfig:
diff --git a/textw/welcome_text.py b/textw/welcome_text.py
index fe553cd93..462090271 100644
--- a/textw/welcome_text.py
+++ b/textw/welcome_text.py
@@ -39,7 +39,7 @@ class WelcomeWindow:
class ReconfigWelcomeWindow:
def __call__(self, screen):
- rc = ButtonChoiceWindow(screen, _("%s"),
+ rc = ButtonChoiceWindow(screen, _("%s") % (productName,),
_("Welcome to %s!\n\n"
"You have entered reconfiguration mode, "
"which will allow you to configure "