From cb0cbeec7ca211d0e68cbfad349a023b76b195d5 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Thu, 2 Oct 2008 16:34:37 +0000
Subject: pass default choice to install::steps_gtk::reallyChooseDesktop

---
 perl-install/install/steps_gtk.pm         | 3 +--
 perl-install/install/steps_interactive.pm | 3 ++-
 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] } }, 
-- 
cgit v1.2.1