[gnome-shell] network: don't use active connections that are in invalid states

[Giovanni Campagna <gcampagna src gnome org>]

commit 751460712962c22994790a406933916a05ac7180
Author: Giovanni Campagna <gcampagna src gnome org>
Date:   Wed May 8 23:54:32 2013 +0200

    network: don't use active connections that are in invalid states
    
    Only ACTIVE or ACTIVATING connections are important when deciding
    what icon to show, don't fallback on any, possibly invalid or deactivating,
    active connection object.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=676285

 js/ui/status/network.js |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 5852fcf..6df61c3 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -1904,6 +1904,7 @@ const NMApplet = new Lang.Class({
         let default_ip4 = null;
         let default_ip6 = null;
         let active_vpn = null;
+        let active_any = null;
         for (let i = 0; i < this._activeConnections.length; i++) {
             let a = this._activeConnections[i];
 
@@ -1934,10 +1935,15 @@ const NMApplet = new Lang.Class({
             if (a.default6)
                 default_ip6 = a;
 
-            if (a._type == 'vpn')
-                active_vpn = a;
-            else if (a.state == NetworkManager.ActiveConnectionState.ACTIVATING)
+            if (a.state == NetworkManager.ActiveConnectionState.ACTIVATING)
                 activating = a;
+            else if (a.state == NetworkManager.ActiveConnectionState.ACTIVE)
+                active_any = a;
+
+            if (a._type == 'vpn' &&
+                (a.state == NetworkManager.ActiveConnectionState.ACTIVATING ||
+                 a.state == NetworkManager.ActiveConnectionState.ACTIVE))
+                active_vpn = a;
 
             if (!a._primaryDevice) {
                 if (a._type != NetworkManager.SETTING_VPN_SETTING_NAME) {
@@ -1965,7 +1971,7 @@ const NMApplet = new Lang.Class({
             }
         }
 
-        this._mainConnection = activating || default_ip4 || default_ip6 || this._activeConnections[0] || 
null;
+        this._mainConnection = activating || default_ip4 || default_ip6 || active_any || null;
         this._vpnConnection = active_vpn;
     },