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

status/network: Use bindings to update VPN indicator

Browse Source 
Now that the VPN section is a GObject, we can set up proper bindings
for icon-name and visibility.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2408>
This commit is contained in:
Florian Müllner 2022-08-03 04:11:15 +02:00 committed by Marge Bot
parent 11283be390
commit ded451f334
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1528,14 +1528,6 @@ class NMVpnSection extends NMSection {
deactivateConnection(activeConnection) {
this._client.deactivate_connection(activeConnection, null);
}
getIndicatorIcon() {
for (const item of this._items.values()) {
if (item.is_active)
return item.icon_name;
}
return '';
}
});
const NMDeviceSection = GObject.registerClass(
@ -1746,9 +1738,6 @@ class Indicator extends PanelMenu.SystemIndicator {
_init() {
super._init();
this._primaryIndicator = this._addIndicator();
this._vpnIndicator = this._addIndicator();
this._connectivityQueue = new Set();
this._mainConnection = null;
@ -1780,6 +1769,16 @@ class Indicator extends PanelMenu.SystemIndicator {
this.menu.addMenuItem(section.menu);
});
this._primaryIndicator = this._addIndicator();
this._vpnIndicator = this._addIndicator();
this._vpnSection.bind_property('checked',
this._vpnIndicator, 'visible',
GObject.BindingFlags.SYNC_CREATE);
this._vpnSection.bind_property('icon-name',
this._vpnIndicator, 'icon-name',
GObject.BindingFlags.SYNC_CREATE);
this._getClient().catch(logError);
}
@ -1983,8 +1982,5 @@ class Indicator extends PanelMenu.SystemIndicator {
this._primaryIndicator.icon_name = 'network-wired-no-route-symbolic';
}
}
this._vpnIndicator.icon_name = this._vpnSection.getIndicatorIcon();
this._vpnIndicator.visible = this._vpnIndicator.icon_name !== null;
}
});