diff options
| author | Jeremy Katz <katzj@redhat.com> | 2006-02-22 20:00:32 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2006-02-22 20:00:32 +0000 |
| commit | 44eb3dd9f9488ebe6f214a328a8c55d7d3c73cf8 (patch) | |
| tree | adf919bcfc3d3dfc4d1297a350a6b7ee307aceca /textw | |
| parent | da4e01fa60d0b0b0844e194e8cde5d32800b56d1 (diff) | |
| download | anaconda-44eb3dd9f9488ebe6f214a328a8c55d7d3c73cf8.tar.gz anaconda-44eb3dd9f9488ebe6f214a328a8c55d7d3c73cf8.tar.xz anaconda-44eb3dd9f9488ebe6f214a328a8c55d7d3c73cf8.zip | |
2006-02-22 Jeremy Katz <katzj@redhat.com>
* lang-table: Set all previously bterm using languages to "none"
for the fact that we can't handle them in text-mode anymore
* textw/language_text.py (LanguageWindow.__call__): Remove bterm
special-casing.
* text.py (InstallInterface.run): Likewise.
* loader2/lang.c (setupLanguage): Likewise.
* language.py (Language.fixLang): No more "bterm" font
* stubs/unicode-lite.c: Don't require wlite
* stubs/Makefile: Don't link against wlite
* loader2/Makefile: No more linking to bterm here either
* isys/lang.c: Remove bterm support code.
* isys/lang.h: And declaration.
* isys/Makefile (LOADLIBES): No more linking to bterm
* isys/isys.c (start_bterm): Remove this
* anaconda.spec (BuildPreReq): Bye-bye bogl
Diffstat (limited to 'textw')
| -rw-r--r-- | textw/language_text.py | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/textw/language_text.py b/textw/language_text.py index ab2a8ab7c..8e481e940 100644 --- a/textw/language_text.py +++ b/textw/language_text.py @@ -55,31 +55,15 @@ class LanguageWindow: return INSTALL_OK if (flags.setupFilesystems and - instLanguage.getFontFile(choice) == "bterm" + instLanguage.getFontFile(choice) == "none" and textInterface.isRealConsole()): - # bterm to the rescue... have to shut down the screen and - # create a new one, though (and do a sleep) - log.info("starting bterm") - try: - screen.finish() - rc = isys.startBterm() - time.sleep(1) - except Exception, e: - log.error("got an exception starting bterm: %s" %(e,)) - rc = 1 - newscreen = SnackScreen() - textInterface.setScreen(newscreen) - screen = newscreen - - if rc == 1: - ButtonChoiceWindow(screen, "Language Unavailable", - "%s display is unavailable in text mode. " - "The installation will continue in " - "English." % (choice,), - buttons=[TEXT_OK_BUTTON]) - instLanguage.setRuntimeDefaults(choice) - return INSTALL_OK - + ButtonChoiceWindow(screen, "Language Unavailable", + "%s display is unavailable in text mode. " + "The installation will continue in " + "English." % (choice,), + buttons=[TEXT_OK_BUTTON]) + instLanguage.setRuntimeDefaults(choice) + return INSTALL_OK instLanguage.setRuntimeLanguage(choice) instLanguage.setDefault(choice) |