[gnome-shell] NetworkMenu: use the carrier state to the decide if wired should be shown
- From: Giovanni Campagna <gcampagna src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] NetworkMenu: use the carrier state to the decide if wired should be shown
- Date: Tue, 4 Feb 2014 21:25:28 +0000 (UTC)
commit c4aeaf7fe81c31abec5e0dcebbd1243e888efccd
Author: Giovanni Campagna <gcampagna src gnome org>
Date: Tue Jan 28 23:41:13 2014 +0100
NetworkMenu: use the carrier state to the decide if wired should be shown
The design says "when a network cable is connected", not
"When a network cable is connected and the link is up and we
have an IP etc. etc." (which is what ACTIVATED would imply).
https://bugzilla.gnome.org/show_bug.cgi?id=723570
js/ui/status/network.js | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 5c43ed3..1d6d7c5 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -432,16 +432,15 @@ const NMDeviceWired = new Lang.Class({
this.item.menu.addMenuItem(createSettingsAction(_("Wired Settings"), device));
},
- _isConnected: function() {
- if (!this._device.active_connection)
- return false;
-
- let state = this._device.active_connection.state;
- return state >= NetworkManager.ActiveConnectionState.ACTIVATING;
+ _hasCarrier: function() {
+ if (this._device instanceof NMClient.DeviceEthernet)
+ return this._device.carrier;
+ else
+ return true;
},
_sync: function() {
- this.item.actor.visible = this._isConnected();
+ this.item.actor.visible = this._hasCarrier();
this.parent();
},
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]