summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-08-20 06:02:17 +0000
committerOlivier Blin <oblin@mandriva.org>2004-08-20 06:02:17 +0000
commit41d8f9619bdf5bc440b1e829a233ebbcffd23547 (patch)
treeba5f02128948407bb5bc3e119eb9343fa03c2828
parentb01562e1827926be70ed81cd023df7a405baf997 (diff)
downloaddrakx-41d8f9619bdf5bc440b1e829a233ebbcffd23547.tar
drakx-41d8f9619bdf5bc440b1e829a233ebbcffd23547.tar.gz
drakx-41d8f9619bdf5bc440b1e829a233ebbcffd23547.tar.bz2
drakx-41d8f9619bdf5bc440b1e829a233ebbcffd23547.tar.xz
drakx-41d8f9619bdf5bc440b1e829a233ebbcffd23547.zip
do not assume internet isn't configured if connect scripts do not
exist (they're obsolete), fix connect button sensitivity
-rwxr-xr-xperl-install/standalone/net_monitor5
1 files changed, 2 insertions, 3 deletions
diff --git a/perl-install/standalone/net_monitor b/perl-install/standalone/net_monitor
index ccffe73cb..ddc8f187e 100755
--- a/perl-install/standalone/net_monitor
+++ b/perl-install/standalone/net_monitor
@@ -156,7 +156,6 @@ $SIG{CHLD} = sub {
$child_pid = waitpid(-1, POSIX::WNOHANG);
if ($tool_pid eq $child_pid) {
undef $tool_pid;
- $button_connect->set_sensitive(1);
$button_close->set_sensitive(1);
}
} while $child_pid > 0;
@@ -475,10 +474,10 @@ sub update() {
$statusbar->pop(1);
$statusbar->push(1, $isconnected == 1 ? N("Connected") : N("Not connected"));
}
+ $button_connect->set_sensitive(1);
$button_connect->set("label", $isconnected == 1 ? N("Disconnect %s", translate($netcnx->{type})) : N("Connect %s", $netcnx->{type}));
- $button_connect->set_sensitive($default_intf || scalar(@interfaces));
}
- if (!(-e $network::tools::connect_file && -e $network::tools::disconnect_file)) {
+ unless ($default_intf || @interfaces) {
$button_connect->set_sensitive(0);
$button_connect->set("label", N("No internet connection configured"));
}