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

status/network: Simplify section setup

Browse Source 
With the latest changes, device- and VPN sections now require
exactly the same setup.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2407>
This commit is contained in:
Florian Müllner 2022-08-01 19:11:59 +02:00 committed by Marge Bot
parent 392f72bf1c
commit 78154d9d20
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1626,10 +1626,13 @@ class Indicator extends PanelMenu.SystemIndicator {
this._notification = null; this._notification = null;
this._allSections = [];
this._wiredSection = new NMWiredSection(); this._wiredSection = new NMWiredSection();
this._wirelessSection = new NMWirelessSection(); this._wirelessSection = new NMWirelessSection();
this._modemSection = new NMModemSection(); this._modemSection = new NMModemSection();
this._btSection = new NMBluetoothSection(); this._btSection = new NMBluetoothSection();
this._vpnSection = new NMVpnSection();
this._deviceSections = new Map([ this._deviceSections = new Map([
[NM.DeviceType.ETHERNET, this._wiredSection], [NM.DeviceType.ETHERNET, this._wiredSection],
@ -1637,18 +1640,16 @@ class Indicator extends PanelMenu.SystemIndicator {
[NM.DeviceType.MODEM, this._modemSection], [NM.DeviceType.MODEM, this._modemSection],
[NM.DeviceType.BT, this._btSection], [NM.DeviceType.BT, this._btSection],
]); ]);
for (const section of this._deviceSections.values()) { this._allSections.push(...this._deviceSections.values());
this._allSections.push(this._vpnSection);
this._allSections.forEach(section => {
section.connectObject( section.connectObject(
'activation-failed', () => this._onActivationFailed(), 'activation-failed', () => this._onActivationFailed(),
'icon-changed', () => this._updateIcon(), 'icon-changed', () => this._updateIcon(),
this); this);
this.menu.addMenuItem(section); this.menu.addMenuItem(section);
} });
this._vpnSection = new NMVpnSection();
this._vpnSection.connect('activation-failed', this._onActivationFailed.bind(this));
this._vpnSection.connect('icon-changed', this._updateIcon.bind(this));
this.menu.addMenuItem(this._vpnSection);
this._getClient().catch(logError); this._getClient().catch(logError);
} }
@ -1656,9 +1657,8 @@ class Indicator extends PanelMenu.SystemIndicator {
async _getClient() { async _getClient() {
this._client = await NM.Client.new_async(null); this._client = await NM.Client.new_async(null);
this._deviceSections.forEach( this._allSections.forEach(
section => section.setClient(this._client)); section => section.setClient(this._client));
this._vpnSection.setClient(this._client);
this._client.bind_property('nm-running', this._client.bind_property('nm-running',
this, 'visible', this, 'visible',