[gnome-shell] status/network: Store sections by device type
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] status/network: Store sections by device type
- Date: Wed, 10 Aug 2022 13:56:30 +0000 (UTC)
commit 392f72bf1c9115cfbcd105d89a0d2add72d1f0af
Author: Florian Müllner <fmuellner gnome org>
Date: Mon Aug 1 16:19:43 2022 +0200
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: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2407>
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 5481d7191c..148169b464 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(
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]