From cd9c5b9c5df665f6da0e57ee7ead4ba3219b3109 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Mon, 29 Apr 2013 13:09:01 -0400 Subject: [PATCH] network: Remove semi-complex primary device finding According to dcbw (and some updated documentation), there will always be a 1:1 correspondence between NMActiveConnection and an NMDevice. https://bugzilla.gnome.org/show_bug.cgi?id=700322 --- js/ui/status/network.js | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/js/ui/status/network.js b/js/ui/status/network.js index 6df61c3c6..de4444a9e 100644 --- a/js/ui/status/network.js +++ b/js/ui/status/network.js @@ -1946,18 +1946,10 @@ const NMApplet = new Lang.Class({ active_vpn = a; if (!a._primaryDevice) { - if (a._type != NetworkManager.SETTING_VPN_SETTING_NAME) { - // find a good device to be considered primary - a._primaryDevice = null; - let devices = a.get_devices() || []; - for (let j = 0; j < devices.length; j++) { - let d = devices[j]; - if (d._delegate) { - a._primaryDevice = d._delegate; - break; - } - } - } else + if (a._type != NetworkManager.SETTING_VPN_SETTING_NAME) + // This list is guaranteed to have one device in it. + a._primaryDevice = a.get_devices()[0]._delegate; + else a._primaryDevice = this._vpnSection; if (a._primaryDevice)