diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-06-06 16:33:31 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-06-06 16:33:31 +0000 |
| commit | e0779b7bf137a60bf6e6cd3adee4aabffcd28c73 (patch) | |
| tree | 20b8340a621390a3fc967ef5fb3723c78b4033c7 /textw/xconfig_text.py | |
| parent | 91d5fc40d23a5fb5b225287090e8074d0054fa6e (diff) | |
| download | anaconda-e0779b7bf137a60bf6e6cd3adee4aabffcd28c73.tar.gz anaconda-e0779b7bf137a60bf6e6cd3adee4aabffcd28c73.tar.xz anaconda-e0779b7bf137a60bf6e6cd3adee4aabffcd28c73.zip | |
merge taroon branch. mostly package bits, but a lot of other misc stuff
and cleanups in here too
Diffstat (limited to 'textw/xconfig_text.py')
| -rw-r--r-- | textw/xconfig_text.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/textw/xconfig_text.py b/textw/xconfig_text.py index 405d53a6d..a99b85f51 100644 --- a/textw/xconfig_text.py +++ b/textw/xconfig_text.py @@ -84,7 +84,7 @@ class XCustomWindow: print "Invalid widget in xconfig_text::desktopCB" - def __call__(self, screen, xsetup, monitor, videocard, desktop, comps, + def __call__(self, screen, xsetup, monitor, videocard, desktop, grpset, instClass, instPath): self.instPath = instPath @@ -113,11 +113,11 @@ class XCustomWindow: "1920x1440", "2048x1536"] #--If both KDE and GNOME are selected - if comps: - gnomeSelected = (comps.packages.has_key('gnome-session') - and comps.packages['gnome-session'].selected) - kdeSelected = (comps.packages.has_key('kdebase') - and comps.packages['kdebase'].selected) + if grpset: + gnomeSelected = (grpset.hdrlist.has_key('gnome-session') + and grpset.hdrlist['gnome-session'].isSelected()) + kdeSelected = (grpset.hdrlist.has_key('kdebase') + and grpset.hdrlist['kdebase'].isSelected()) else: gnomeSelected = 0 kdeSelected = 0 @@ -619,7 +619,7 @@ class XConfigWindowCard: text = _("Your system will be setup to " "use the frame buffer driver for " "the X Window System. If you do " - "not want setup the X Window " + "not want to setup the X Window " "System, choose " "'Skip X Configuration' below.") |