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

status/network: Remove reason param from ::activation-failed

Browse Source 
We never used it, so after more than ten years, it seems safe to
assume that we never will.

Plus different items pass different types, which makes it pretty
much impossible to use, even if we wanted to (which apparently
we don't 🤷️)

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2406>
This commit is contained in:
Florian Müllner 2022-08-01 01:21:50 +02:00
parent de175dfca4
commit 44f0a9560c
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -296,9 +296,7 @@ var NMConnectionSection = class NMConnectionSection extends Signals.EventEmitter
return; return;
item.connect('icon-changed', () => this._iconChanged()); item.connect('icon-changed', () => this._iconChanged());
item.connect('activation-failed', (o, reason) => { item.connect('activation-failed', () => this.emit('activation-failed'));
this.emit('activation-failed', reason);
});
item.connect('name-changed', this._sync.bind(this)); item.connect('name-changed', this._sync.bind(this));
let pos = Util.insertSorted(this._connections, connection, this._connectionSortFunction.bind(this)); let pos = Util.insertSorted(this._connections, connection, this._connectionSortFunction.bind(this));
@ -386,7 +384,7 @@ var NMConnectionDevice = class NMConnectionDevice extends NMConnectionSection {
cancelled the agent dialog */ cancelled the agent dialog */
if (newstate == NM.DeviceState.FAILED && if (newstate == NM.DeviceState.FAILED &&
reason != NM.DeviceStateReason.NO_SECRETS) reason != NM.DeviceStateReason.NO_SECRETS)
this.emit('activation-failed', reason); this.emit('activation-failed');
this._sync(); this._sync();
} }
@ -1316,7 +1314,7 @@ var NMDeviceWireless = class extends Signals.EventEmitter {
cancelled the agent dialog */ cancelled the agent dialog */
if (newstate == NM.DeviceState.FAILED && if (newstate == NM.DeviceState.FAILED &&
reason != NM.DeviceStateReason.NO_SECRETS) reason != NM.DeviceStateReason.NO_SECRETS)
this.emit('activation-failed', reason); this.emit('activation-failed');
this._sync(); this._sync();
} }
@ -1481,12 +1479,8 @@ var NMWireguardItem = class extends NMConnectionItem {
_connectionStateChanged(ac, newstate, reason) { _connectionStateChanged(ac, newstate, reason) {
if (newstate === NM.ActiveConnectionState.DEACTIVATED && if (newstate === NM.ActiveConnectionState.DEACTIVATED &&
reason !== NM.ActiveConnectionStateReason.NO_SECRETS) { reason !== NM.ActiveConnectionStateReason.NO_SECRETS)
// FIXME: if we ever want to show something based on reason, this.emit('activation-failed');
// we need to convert from NM.ActiveConnectionStateReason
// to NM.DeviceStateReason
this.emit('activation-failed', reason);
}
this.emit('icon-changed'); this.emit('icon-changed');
super._connectionStateChanged(); super._connectionStateChanged();
@ -1553,13 +1547,9 @@ var NMVpnConnectionItem = class extends NMConnectionItem {
} }
_connectionStateChanged(ac, newstate, reason) { _connectionStateChanged(ac, newstate, reason) {
if (newstate == NM.VpnConnectionState.FAILED && if (newstate === NM.VpnConnectionState.FAILED &&
reason != NM.VpnConnectionStateReason.NO_SECRETS) { reason !== NM.VpnConnectionStateReason.NO_SECRETS)
// FIXME: if we ever want to show something based on reason, this.emit('activation-failed');
// we need to convert from NM.VpnConnectionStateReason
// to NM.DeviceStateReason
this.emit('activation-failed', reason);
}
this.emit('icon-changed'); this.emit('icon-changed');
super._connectionStateChanged(); super._connectionStateChanged();
@ -1859,7 +1849,7 @@ class Indicator extends PanelMenu.SystemIndicator {
this._source.showNotification(this._notification); this._source.showNotification(this._notification);
} }
_onActivationFailed(_device, _reason) { _onActivationFailed() {
// XXX: nm-applet has no special text depending on reason // XXX: nm-applet has no special text depending on reason
// but I'm not sure of this generic message // but I'm not sure of this generic message
this._notify('network-error-symbolic', this._notify('network-error-symbolic',