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

status/network: Store sections by device type

Browse Source 
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: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2407>
This commit is contained in:
Florian Müllner 2022-08-01 16:19:43 +02:00 committed by Marge Bot
parent acda87dd26
commit 392f72bf1c
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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(