From a51283fad449d1ac3dbb01c65dd6f04aa57416c3 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Tue, 20 May 2003 15:29:42 +0000 Subject: merge fix from taroon --- iw/xconfig_gui.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'iw/xconfig_gui.py') diff --git a/iw/xconfig_gui.py b/iw/xconfig_gui.py index 385fe5d85..208c825d7 100644 --- a/iw/xconfig_gui.py +++ b/iw/xconfig_gui.py @@ -210,7 +210,7 @@ class XCustomWindow (InstallWindow): self.display_desktop_pixmap(desktop) # XCustomWindow tag="xcustom" - def getScreen (self, xsetup, monitor, videocard, desktop, comps, + def getScreen (self, xsetup, monitor, videocard, desktop, grpset, instClass, instPath): self.xsetup = xsetup @@ -318,11 +318,11 @@ class XCustomWindow (InstallWindow): self.box.pack_start (hbox1, gtk.FALSE) #--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 -- cgit