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

status/network: Create indicator sections in constructor

Browse Source 
We currently wait until we got a connection to NetworkManager.

That's possible because the old PanelMenu indicator API takes
a menu, so it is possible to add or remove items dynamically
later.

That won't be the case with quick settings, where `quickSettingsItems`
is a plain array that is only read once when adding the indicator.

Prepare for that by moving section initialization into the constructor.

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

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

@ -1298,11 +1298,9 @@ const NMVpnConnectionItem = GObject.registerClass({
}); });
var NMVpnSection = class extends PopupMenu.PopupMenuSection { var NMVpnSection = class extends PopupMenu.PopupMenuSection {
constructor(client) { constructor() {
super(); super();
this._client = client;
this._items = new Map(); this._items = new Map();
this._itemSorter = new ItemSorter(); this._itemSorter = new ItemSorter();
@ -1311,14 +1309,25 @@ var NMVpnSection = class extends PopupMenu.PopupMenuSection {
this.addSettingsAction(_('VPN Settings'), this.addSettingsAction(_('VPN Settings'),
'gnome-network-panel.desktop'); 'gnome-network-panel.desktop');
}
this._client.connectObject( setClient(client) {
if (this._client === client)
return;
this._client?.disconnectObject(this);
this._client = client;
this._client?.connectObject(
'connection-added', (c, conn) => this._addConnection(conn), 'connection-added', (c, conn) => this._addConnection(conn),
'connection-removed', (c, conn) => this._removeConnection(conn), 'connection-removed', (c, conn) => this._removeConnection(conn),
'notify::active-connections', () => this._syncActiveConnections(), 'notify::active-connections', () => this._syncActiveConnections(),
this); this);
this._loadInitialItems(); this._items.forEach(item => item.destroy());
this._items.clear();
if (this._client)
this._loadInitialItems();
} }
_loadInitialItems() { _loadInitialItems() {
@ -1538,6 +1547,15 @@ class Indicator extends PanelMenu.SystemIndicator {
this._primaryIndicator = this._addIndicator(); this._primaryIndicator = this._addIndicator();
this._vpnIndicator = this._addIndicator(); this._vpnIndicator = this._addIndicator();
this._connections = [];
this._connectivityQueue = new Set();
this._mainConnection = null;
this._notification = null;
this._nmDevices = [];
// Device types // Device types
this._dtypes = { }; this._dtypes = { };
this._dtypes[NM.DeviceType.ETHERNET] = NMWiredDeviceItem; this._dtypes[NM.DeviceType.ETHERNET] = NMWiredDeviceItem;
@ -1553,21 +1571,6 @@ class Indicator extends PanelMenu.SystemIndicator {
this._ctypes[NM.SETTING_CDMA_SETTING_NAME] = NMConnectionCategory.WWAN; this._ctypes[NM.SETTING_CDMA_SETTING_NAME] = NMConnectionCategory.WWAN;
this._ctypes[NM.SETTING_GSM_SETTING_NAME] = NMConnectionCategory.WWAN; this._ctypes[NM.SETTING_GSM_SETTING_NAME] = NMConnectionCategory.WWAN;
this._getClient().catch(logError);
}
async _getClient() {
this._client = await NM.Client.new_async(null);
this._connections = [];
this._connectivityQueue = new Set();
this._mainConnection = null;
this._notification = null;
this._nmDevices = [];
this._wiredSection = new NMWiredSection(); this._wiredSection = new NMWiredSection();
this._wirelessSection = new NMWirelessSection(); this._wirelessSection = new NMWirelessSection();
this._modemSection = new NMModemSection(); this._modemSection = new NMModemSection();
@ -1582,11 +1585,19 @@ class Indicator extends PanelMenu.SystemIndicator {
for (const section of this._deviceSections.values()) for (const section of this._deviceSections.values())
this.menu.addMenuItem(section); this.menu.addMenuItem(section);
this._vpnSection = new NMVpnSection(this._client); this._vpnSection = new NMVpnSection();
this._vpnSection.connect('activation-failed', this._onActivationFailed.bind(this)); this._vpnSection.connect('activation-failed', this._onActivationFailed.bind(this));
this._vpnSection.connect('icon-changed', this._updateIcon.bind(this)); this._vpnSection.connect('icon-changed', this._updateIcon.bind(this));
this.menu.addMenuItem(this._vpnSection); this.menu.addMenuItem(this._vpnSection);
this._getClient().catch(logError);
}
async _getClient() {
this._client = await NM.Client.new_async(null);
this._vpnSection.setClient(this._client);
this._readConnections(); this._readConnections();
this._readDevices(); this._readDevices();
this._syncMainConnection(); this._syncMainConnection();