summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-08-25 13:41:49 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-08-25 13:41:49 +0000
commit01604fd2820239a0c2e2e98ff4dc86fa69472576 (patch)
tree4ffc40097cb7fd1ae86495fbbdf5c6eec363bdb6
parentdebca0f079a807a1fc05997de736c69a3fcf97eb (diff)
downloaddrakx-01604fd2820239a0c2e2e98ff4dc86fa69472576.tar
drakx-01604fd2820239a0c2e2e98ff4dc86fa69472576.tar.gz
drakx-01604fd2820239a0c2e2e98ff4dc86fa69472576.tar.bz2
drakx-01604fd2820239a0c2e2e98ff4dc86fa69472576.tar.xz
drakx-01604fd2820239a0c2e2e98ff4dc86fa69472576.zip
fix drakconnect not working on console (found by poulpy) due to having
killed pre_func() which used to set a background pixmap in the old days, thus the bogus test that went in.
-rw-r--r--perl-install/network/netconnect.pm10
1 files changed, 4 insertions, 6 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index f59846571..0bc5eddf5 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -152,12 +152,10 @@ If you don't want to use the auto detection, deselect the checkbox.
load_conf($netcnx, $netc, $intf);
foreach my $type (qw(modem winmodem isdn adsl cable lan)) {
$conf{$type} and do {
- $in->isa('interactive::gtk') and do {
- #-PO here, "forward" is the standard gtk+ button for "next"; check what is displayed in your language
- $in->ask_okcancel(N("Network Configuration Wizard"), N("We are now going to configure the %s connection.\n\n\nPress \"%s\" to continue.", translate($type), N("Next")), 1) or goto step_2;
- &{$net_conf_callbacks{$type}} or goto step_2;
- $netconnect::need_restart_network = 1 if $type =~ /lan|cable/;
- }
+ #-PO here, "forward" is the standard gtk+ button for "next"; check what is displayed in your language
+ $in->ask_okcancel(N("Network Configuration Wizard"), N("We are now going to configure the %s connection.\n\n\nPress \"%s\" to continue.", translate($type), N("Next")), 1) or goto step_2;
+ &{$net_conf_callbacks{$type}} or goto step_2;
+ $netconnect::need_restart_network = 1 if $type =~ /lan|cable/;
}
}
};