brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NetworkMenu: keep the connection list visible when connecting...

Browse Source 
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
This commit is contained in:
Giovanni Campagna 2011-04-01 15:37:54 +02:00
parent 38219fec99
commit 38bcd52065
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/ui/status/network.js
View File

@ -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