summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-09-08 11:40:40 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-09-08 11:40:40 +0000
commita9de3d40e931ae5727f7011ee4b6cf86bac7b8af (patch)
treec62a83490bf25100d38fe1354e4c6d68cd41635b
parentc7ce6282bc6360e3106818c301c550523f7a1f7a (diff)
downloaddrakx-a9de3d40e931ae5727f7011ee4b6cf86bac7b8af.tar
drakx-a9de3d40e931ae5727f7011ee4b6cf86bac7b8af.tar.gz
drakx-a9de3d40e931ae5727f7011ee4b6cf86bac7b8af.tar.bz2
drakx-a9de3d40e931ae5727f7011ee4b6cf86bac7b8af.tar.xz
drakx-a9de3d40e931ae5727f7011ee4b6cf86bac7b8af.zip
no_comment
-rw-r--r--perl-install/interactive.pm16
-rw-r--r--perl-install/interactive_gtk.pm1
2 files changed, 9 insertions, 8 deletions
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index 4cf9ef95b..44fcae50f 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -126,14 +126,14 @@ sub ask_from_entries_ref($$$$;$%) {
my ($o, $title, $message, $l, $val, %callback) = @_;
$message = ref $message ? $message : [ $message ];
- my $val_hash = [ map
- { if ((ref $_) eq "SCALAR") {
- { val => $_ }
- } else {
- ($_->{list} && @{$_->{list}}) ?
- { %{$_}, type => "list"} : $_
- }
- } @{$val} ];
+ my $val_hash = [ map {
+ if ((ref $_) eq "SCALAR") {
+ { val => $_ }
+ } else {
+ ($_->{list} && @{$_->{list}}) ?
+ { %{$_}, type => "list"} : $_;
+ }
+ } @$val ];
$o->ask_from_entries_refW($title, $message, $l, $val_hash, %callback)
diff --git a/perl-install/interactive_gtk.pm b/perl-install/interactive_gtk.pm
index 12ff75ac4..1afb5b420 100644
--- a/perl-install/interactive_gtk.pm
+++ b/perl-install/interactive_gtk.pm
@@ -180,6 +180,7 @@ sub ask_from_entries_refW {
foreach (@updates_inv) { &{$_};}
$ignore = 0;
if ($error) {
+ $focus ||= 0;
comb_entry($entries[$focus], $val->[$focus])->grab_focus();
} else {
return 1;