summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-10-02 16:34:37 +0000
committerOlivier Blin <oblin@mandriva.com>2008-10-02 16:34:37 +0000
commitcb0cbeec7ca211d0e68cbfad349a023b76b195d5 (patch)
treefed8e304df9c7d8226d447f33d44b3f92e933780
parent13023a5c5ba4178c3d34204b8477d006cf587705 (diff)
downloaddrakx-backup-do-not-use-cb0cbeec7ca211d0e68cbfad349a023b76b195d5.tar
drakx-backup-do-not-use-cb0cbeec7ca211d0e68cbfad349a023b76b195d5.tar.gz
drakx-backup-do-not-use-cb0cbeec7ca211d0e68cbfad349a023b76b195d5.tar.bz2
drakx-backup-do-not-use-cb0cbeec7ca211d0e68cbfad349a023b76b195d5.tar.xz
drakx-backup-do-not-use-cb0cbeec7ca211d0e68cbfad349a023b76b195d5.zip
pass default choice to install::steps_gtk::reallyChooseDesktop
-rw-r--r--perl-install/install/steps_gtk.pm3
-rw-r--r--perl-install/install/steps_interactive.pm3
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index ab29b4f15..095b80941 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -228,11 +228,10 @@ sub selectMouse {
}
sub reallyChooseDesktop {
- my ($o, $title, $message, $choices) = @_;
+ my ($o, $title, $message, $choices, $choice) = @_;
my $w = ugtk2->new($title);
- my $choice = $choices->[0];
my %tips = (
KDE => N("Install Mandriva KDE Desktop"),
GNOME => N("Install Mandriva GNOME Desktop"),
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index 166fca1a2..68e61a134 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -494,9 +494,10 @@ sub _chooseDesktop {
my $title = N("Desktop Selection");
my $message = N("You can choose your workstation desktop profile.");
+ my $default_choice = $choices->[0];
my $choice;
if ($o->isa('interactive::gtk')) {
- $choice = install::steps_gtk::reallyChooseDesktop($o, $title, $message, \@l);
+ $choice = install::steps_gtk::reallyChooseDesktop($o, $title, $message, \@l, $default_choice);
} else {
$o->ask_from_({ title => $title, message => $message }, [
{ val => \$choice, list => \@l, type => 'list', format => sub { $_[0][1] } },