diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2003-02-13 19:37:16 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2003-02-13 19:37:16 +0000 |
| commit | b5f9832e36a7c2d7dc740cb53a406175480165b9 (patch) | |
| tree | 3c63590ff7bde248e1eeccf3baf21295b2beecda | |
| parent | 8c5ccde3e9796cd4632f4613ee9f6286591bc8c5 (diff) | |
| download | drakx-backup-do-not-use-b5f9832e36a7c2d7dc740cb53a406175480165b9.tar drakx-backup-do-not-use-b5f9832e36a7c2d7dc740cb53a406175480165b9.tar.gz drakx-backup-do-not-use-b5f9832e36a7c2d7dc740cb53a406175480165b9.tar.bz2 drakx-backup-do-not-use-b5f9832e36a7c2d7dc740cb53a406175480165b9.tar.xz drakx-backup-do-not-use-b5f9832e36a7c2d7dc740cb53a406175480165b9.zip | |
fix ask_warn(), really dont make it pop
| -rw-r--r-- | perl-install/interactive.pm | 4 | ||||
| -rw-r--r-- | perl-install/interactive/gtk.pm | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm index 958b54a6b..b32991c4c 100644 --- a/perl-install/interactive.pm +++ b/perl-install/interactive.pm @@ -195,7 +195,7 @@ sub ask_from_listf_raw { sub ask_from_listf_raw_no_check { my ($o, $common, $f, $l, $def) = @_; - if (@$l <= 2 && !$::isWizard) { + if (@$l <= ($::isWizard ? 1 : 2)) { my ($ok, $cancel) = map { $_ && may_apply($f, $_) } @$l; if (length "$ok$cancel" < 70) { my $ret = eval { @@ -207,7 +207,7 @@ sub ask_from_listf_raw_no_check { return $@ ? undef : $ret; } } - ask_from_($o, $common, [ { val => \$def, type => 'list', list => $l, format => $f } ]) && $def; + ask_from_no_check($o, $common, [ { val => \$def, type => 'list', list => $l, format => $f } ]) && $def; } sub ask_from_treelist { diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index e67a4a5c7..63f50da37 100644 --- a/perl-install/interactive/gtk.pm +++ b/perl-install/interactive/gtk.pm @@ -21,11 +21,6 @@ sub leave_console { my ($o) = @_; common::setVirtual(delete $o->{suspended}) } sub exit { ugtk2::exit(@_) } -sub ask_warn { - local $ugtk2::pop_it = 1; - &interactive::ask_warn; -} - sub ask_fileW { my ($_o, $title, $dir) = @_; my $w = ugtk2->new($title); |