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

NetworkMenu: don't notify for failed connections if cancelled by the user

Browse Source 
If the user cancels the secret dialog, the NM will report the connection
failure, but we should not notify it as it is a user-initiated action.

https://bugzilla.gnome.org/show_bug.cgi?id=684823
This commit is contained in:
Giovanni Campagna 2012-10-02 21:02:59 +02:00
parent 29cb10fed8
commit 6b1e632621
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -574,7 +574,11 @@ const NMDevice = new Lang.Class({
this.emit('network-lost'); this.emit('network-lost');
} }
if (newstate == NetworkManager.DeviceState.FAILED) { /* Emit a notification if activation fails, but don't do it
if the reason is no secrets, as that indicates the user
cancelled the agent dialog */
if (newstate == NetworkManager.DeviceState.FAILED &&
reason != NetworkManager.DeviceStateReason.NO_SECRETS) {
this.emit('activation-failed', reason); this.emit('activation-failed', reason);
} }
@ -1540,7 +1544,8 @@ const NMVPNSection = new Lang.Class({
}, },
_connectionStateChanged: function(vpnConnection, newstate, reason) { _connectionStateChanged: function(vpnConnection, newstate, reason) {
if (newstate == NetworkManager.VPNConnectionState.FAILED) { if (newstate == NetworkManager.VPNConnectionState.FAILED &&
reason != NetworkManager.VPNConnectionStateReason.NO_SECRETS) {
// FIXME: if we ever want to show something based on reason, // FIXME: if we ever want to show something based on reason,
// we need to convert from NetworkManager.VPNConnectionStateReason // we need to convert from NetworkManager.VPNConnectionStateReason
// to NetworkManager.DeviceStateReason // to NetworkManager.DeviceStateReason