summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-10-17 19:56:42 +0000
committerOlivier Blin <oblin@mandriva.org>2005-10-17 19:56:42 +0000
commit17434a9ebed559c50236e7a71a12db50dd53a398 (patch)
tree010c297fa7f89fb5873ba3b93567551721e461ef
parent479bb3e43b45bcab488dbea07e9b971494d3d3ea (diff)
downloaddrakx-backup-do-not-use-17434a9ebed559c50236e7a71a12db50dd53a398.tar
drakx-backup-do-not-use-17434a9ebed559c50236e7a71a12db50dd53a398.tar.gz
drakx-backup-do-not-use-17434a9ebed559c50236e7a71a12db50dd53a398.tar.bz2
drakx-backup-do-not-use-17434a9ebed559c50236e7a71a12db50dd53a398.tar.xz
drakx-backup-do-not-use-17434a9ebed559c50236e7a71a12db50dd53a398.zip
use disconnected icon if no route, even if wifi is associated
-rw-r--r--perl-install/standalone/net_applet12
1 files changed, 8 insertions, 4 deletions
diff --git a/perl-install/standalone/net_applet b/perl-install/standalone/net_applet
index 82ee2a005..c701992a1 100644
--- a/perl-install/standalone/net_applet
+++ b/perl-install/standalone/net_applet
@@ -268,11 +268,15 @@ sub go2State {
sub update_tray_icon() {
if (!$ifw_alert || $img->get_storage_type ne 'pixbuf') {
my $pixbuf;
- if (detect_devices::is_wireless_interface($current_interface)) {
- my $net = find { $_->{current} } values %wireless_networks;
- $pixbuf = $pixbufs{link_level}{$net->{approx_level}} if $net;
+ if ($current_state eq 'connected') {
+ if (detect_devices::is_wireless_interface($current_interface)) {
+ my $net = find { $_->{current} } values %wireless_networks;
+ $pixbuf = $pixbufs{link_level}{$net->{approx_level}} if $net;
+ }
+ $pixbuf ||= $pixbufs{state}{connected}
+ } else {
+ $pixbuf = $pixbufs{state}{disconnected};
}
- $pixbuf ||= $pixbufs{state}{$current_state eq 'connected' ? 'connected' : 'disconnected'};
$img->set_from_pixbuf($pixbuf);
} else {
$img->set_from_stock('gtk-dialog-warning', 'small-toolbar');