[gnome-shell] network: allow disconnecting while activation is in progress

[Giovanni Campagna <gcampagna src gnome org>]

commit 6fbe7656365e5e24b91a44a061a6516a3c7746c7
Author: Giovanni Campagna <gcampagna src gnome org>
Date:   Mon Aug 19 23:49:11 2013 +0200

    network: allow disconnecting while activation is in progress
    
    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

 js/ui/status/network.js |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 169400c..79cb711 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -104,7 +104,7 @@ const NMConnectionItem = new Lang.Class({
         if (this._activeConnection == null)
             return false;
 
-        return this._activeConnection.state == NetworkManager.ActiveConnectionState.ACTIVATED;
+        return this._activeConnection.state <= NetworkManager.ActiveConnectionState.ACTIVATED;
     },
 
     _sync: function() {
@@ -1083,7 +1083,7 @@ const NMVPNConnectionItem = new Lang.Class({
         if (this._activeConnection == null)
             return false;
 
-        return this._activeConnection.vpn_state == NetworkManager.VPNConnectionState.ACTIVATED;
+        return this._activeConnection.vpn_state != NetworkManager.VPNConnectionState.DISCONNECTED;
     },
 
     _getStatus: function() {