summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-01-19 17:56:15 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-01-19 17:56:15 +0000
commitc558a592a788ef9053da44d6b9f40b29c6e78a5e (patch)
tree034b6652cc4a6e4325991d57e6c726809dcac8ce
parentba77819066afb2f9491339cef0cb1bdc4ddaa716 (diff)
downloaddrakx-backup-do-not-use-c558a592a788ef9053da44d6b9f40b29c6e78a5e.tar
drakx-backup-do-not-use-c558a592a788ef9053da44d6b9f40b29c6e78a5e.tar.gz
drakx-backup-do-not-use-c558a592a788ef9053da44d6b9f40b29c6e78a5e.tar.bz2
drakx-backup-do-not-use-c558a592a788ef9053da44d6b9f40b29c6e78a5e.tar.xz
drakx-backup-do-not-use-c558a592a788ef9053da44d6b9f40b29c6e78a5e.zip
use ->ask_from instead of ->ask_from_listf (keeping the same GUI behaviour)
-rwxr-xr-xperl-install/standalone/keyboarddrake12
1 files changed, 7 insertions, 5 deletions
diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake
index 10352b2b5..fbb46da7e 100755
--- a/perl-install/standalone/keyboarddrake
+++ b/perl-install/standalone/keyboarddrake
@@ -21,11 +21,13 @@ if (my ($kb) = grep { !/^-/ } @ARGV) {
$in = 'interactive'->vnew('su');
choose:
- $keyboard->{KEYBOARD} = $in->ask_from_listf(N("Keyboard"),
- N("Please, choose your keyboard layout."),
- sub { translate(keyboard::KEYBOARD2text($_[0])) },
- [ keyboard::KEYBOARDs() ],
- $keyboard->{KEYBOARD}) or goto end;
+ $in->ask_from(N("Keyboard"),
+ N("Please, choose your keyboard layout."),
+ [ { val => \$keyboard->{KEYBOARD},
+ format => sub { translate(keyboard::KEYBOARD2text($_[0])) },
+ list => [ keyboard::KEYBOARDs() ],
+ type => 'list',
+ } ]) or goto end;
keyboard::group_toggle_choose($in, $keyboard) or goto choose;
}