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

network: allow disconnecting while activation is in progress

Browse Source 
While connecting, the item should read "Turn Off", not "Connect".
To do so, change the meaning of isActive() to be really "not isOff()"

https://bugzilla.gnome.org/show_bug.cgi?id=706262
This commit is contained in:
Giovanni Campagna 2013-08-19 23:49:11 +02:00
parent 22b2ccd83d
commit 6fbe765636
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,7 +104,7 @@ const NMConnectionItem = new Lang.Class({
if (this._activeConnection == null) if (this._activeConnection == null)
return false; return false;
return this._activeConnection.state == NetworkManager.ActiveConnectionState.ACTIVATED; return this._activeConnection.state <= NetworkManager.ActiveConnectionState.ACTIVATED;
}, },
_sync: function() { _sync: function() {
@ -1083,7 +1083,7 @@ const NMVPNConnectionItem = new Lang.Class({
if (this._activeConnection == null) if (this._activeConnection == null)
return false; return false;
return this._activeConnection.vpn_state == NetworkManager.VPNConnectionState.ACTIVATED; return this._activeConnection.vpn_state != NetworkManager.VPNConnectionState.DISCONNECTED;
}, },
_getStatus: function() { _getStatus: function() {