From 38bcd520659ca5bc9624169ebe7681fc753f4c86 Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Fri, 1 Apr 2011 15:37:54 +0200 Subject: [PATCH] NetworkMenu: keep the connection list visible when connecting... When a device is connecting, we can continue showing available connections and access points, as well as the active one with the dot. (Hiding was a remnant of when the device status was on a different menu item than the title) https://bugzilla.gnome.org/show_bug.cgi?id=646381 --- js/ui/status/network.js | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/js/ui/status/network.js b/js/ui/status/network.js index c78b08b03..1bb73e7d3 100644 --- a/js/ui/status/network.js +++ b/js/ui/status/network.js @@ -557,8 +557,7 @@ NMDevice.prototype = { }, _shouldShowConnectionList: function() { - return (this.device.state == NetworkManager.DeviceState.DISCONNECTED || - this.device.state == NetworkManager.DeviceState.ACTIVATED); + return (this.device.state >= NetworkManager.DeviceState.DISCONNECTED); }, _createSection: function() { @@ -1809,14 +1808,9 @@ NMApplet.prototype = { if (a.default6) default_ip6 = a; - if (a.state == NetworkManager.ActiveConnectionState.ACTIVATING) { + if (a.state == NetworkManager.ActiveConnectionState.ACTIVATING) activating = a; - // don't set activating connections to devices, NMDevice:state-changed - // should take care of rebuilding the menu - continue; - } - if (!a._primaryDevice) { if (a._type != NetworkManager.SETTING_VPN_SETTING_NAME) { // find a good device to be considered primary