summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-03-06 12:11:39 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-03-06 12:11:39 +0000
commit62467339503b9b07050b7626374ff04f851c0d1b (patch)
tree0ee57f94b3b96144d3762aeca2ba813b8ddc0e75
parentf51b306f56dbc5a87ec9c2356d207054c4ef5a26 (diff)
downloaddrakx-backup-do-not-use-62467339503b9b07050b7626374ff04f851c0d1b.tar
drakx-backup-do-not-use-62467339503b9b07050b7626374ff04f851c0d1b.tar.gz
drakx-backup-do-not-use-62467339503b9b07050b7626374ff04f851c0d1b.tar.bz2
drakx-backup-do-not-use-62467339503b9b07050b7626374ff04f851c0d1b.tar.xz
drakx-backup-do-not-use-62467339503b9b07050b7626374ff04f851c0d1b.zip
fix conflict between i18n and complete signal handler (ie return key
and not value)
-rwxr-xr-xperl-install/standalone/drakxtv35
1 files changed, 17 insertions, 18 deletions
diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv
index 8474e2187..41f1b0ff7 100755
--- a/perl-install/standalone/drakxtv
+++ b/perl-install/standalone/drakxtv
@@ -46,27 +46,26 @@ sub scan4channels {
);
# HRC means Harmonically Related Carrier
- $in->ask_from("TVdrake", _("Please,\ntype in your tv norm and country"),
+ if ($in->ask_from("TVdrake", _("Please,\ntype in your tv norm and country"),
[
{ label => _("TV norm :"), val => \$norm, list => ["NTSC", "NTSC-JP","PAL", "PAL-M", "PAL-N", "PAL-NC", "SECAM"], type => 'combo'},
{ label => _("Area :"), val => \$ftable_id, list => [keys %freqtables], format => sub { $freqtables{$_[0]} }, sort => 1},
- ],
- complete => sub {
- my $wait = $in->wait_message(_('Please wait'),
- _("Scanning for TV channels in progress ..."));
-
-# we provide scantv a bogus table (france) which will
-# will be ignored as "All" is selected because of -a
- $ftable_id = "france -a " if ($ftable_id eq -1);
- # Note that this'll be broken if/when we implement interactive_qt
- my $use_X =$in->isa('interactive_gtk') && -x "/usr/X11R6/bin/xvt";
- system( (($use_X ) ?
- "xvt -T '"._("Scanning for TV channels")." ...' -e ":"")
- . "scantv -n $norm -f $ftable_id -o ~/.xawtv".(($use_X )?"":" &>~/tmp/scantv.log"));
- print "Now, you can run xawtv !\n";
- $in->exit(0);
- },
- );
+ ]
+ )) {
+ my $wait = $in->wait_message(_('Please wait'),
+ _("Scanning for TV channels in progress ..."));
+
+# we provide scantv a bogus table (france) which will
+# will be ignored as "All" is selected because of -a
+ $ftable_id = "france -a " if ($ftable_id eq -1);
+ # Note that this'll be broken if/when we implement interactive_qt
+ my $use_X =$in->isa('interactive_gtk') && -x "/usr/X11R6/bin/xvt";
+ system ( (($use_X ) ?
+ "xvt -T '"._("Scanning for TV channels")." ...' -e ":"")
+ . "scantv -n $norm -f $ftable_id -o ~/.xawtv".(($use_X )?"":" &>~/tmp/scantv.log"));
+ print "Now, you can run xawtv !\n";
+ $in->exit(0);
+ };
$in->exit(0);
}