summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Jennings <derekjenn@gmail.com>2013-08-24 09:27:28 +0100
committerDerek Jennings <derekjenn@gmail.com>2013-08-24 09:27:28 +0100
commit3945a24f419516599855b125102c260533dfb654 (patch)
tree2a434c6d860b26c7fa5c9f2c44168130dffb0a06
parent6b1bd5a9a8771625a783fb1ff794ba06caac0e70 (diff)
downloaddrakx-3945a24f419516599855b125102c260533dfb654.tar
drakx-3945a24f419516599855b125102c260533dfb654.tar.gz
drakx-3945a24f419516599855b125102c260533dfb654.tar.bz2
drakx-3945a24f419516599855b125102c260533dfb654.tar.xz
drakx-3945a24f419516599855b125102c260533dfb654.zip
respect default in desktop select
-rw-r--r--perl-install/install/steps_gtk.pm4
1 files changed, 1 insertions, 3 deletions
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index e27426298..253ea2541 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -260,18 +260,16 @@ sub reallyChooseDesktop {
Custom => N("Custom install"),
);
my $prev;
- my $default_set = 0;
my @l = map {
my $val = $_;
my $sensitive = grep { $_->[0] =~ /$val->[0]/ or $val->[0] eq 'Custom' } map { $_->{flags} } grep { $_->{path} eq 'Graphical Environment' } map { @$_ } $o->{compssUsers};
- $default_set++ if $sensitive;
$choice{$val->[0]} = '0';
$prev = gtknew('CheckButton',
text => $val->[1],
tip => $tips{$val->[0]},
sensitive => $sensitive ? '1' : '0',
toggled => sub { $choice{$val->[0]} = $_[0]->get_active },
- active => $default_set == 1 && $sensitive ? ($choice{$val->[0]} = '1') : '0',
+ active => $sensitive ? ($default_choice == $_) : '0',
);