From 392f72bf1c9115cfbcd105d89a0d2add72d1f0af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Mon, 1 Aug 2022 16:19:43 +0200 Subject: [PATCH] status/network: Store sections by device type Now that the indicator no longer needs to map connections to device wrappers, we can drop the custom 'category' type and just use the device type. Part-of: --- js/ui/status/network.js | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/js/ui/status/network.js b/js/ui/status/network.js index 5481d7191..148169b46 100644 --- a/js/ui/status/network.js +++ b/js/ui/status/network.js @@ -16,15 +16,6 @@ Gio._promisify(Gio.DBusConnection.prototype, 'call'); Gio._promisify(NM.Client, 'new_async'); Gio._promisify(NM.Client.prototype, 'check_connectivity_async'); -const NMConnectionCategory = { - INVALID: 'invalid', - WIRED: 'wired', - WIRELESS: 'wireless', - BLUETOOTH: 'bluetooth', - WWAN: 'wwan', - VPN: 'vpn', -}; - const MAX_VISIBLE_NETWORKS = 8; var MAX_DEVICE_ITEMS = 4; @@ -1641,10 +1632,10 @@ class Indicator extends PanelMenu.SystemIndicator { this._btSection = new NMBluetoothSection(); this._deviceSections = new Map([ - [NMConnectionCategory.WIRED, this._wiredSection], - [NMConnectionCategory.WIRELESS, this._wirelessSection], - [NMConnectionCategory.WWAN, this._modemSection], - [NMConnectionCategory.BLUETOOTH, this._btSection], + [NM.DeviceType.ETHERNET, this._wiredSection], + [NM.DeviceType.WIFI, this._wirelessSection], + [NM.DeviceType.MODEM, this._modemSection], + [NM.DeviceType.BT, this._btSection], ]); for (const section of this._deviceSections.values()) { section.connectObject(