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

status/network: Ensure the Cancel button passes undefined to close()

Browse Source 
The parameter to `ModalDialog.close(timestamp)` is optional. But when
invoked via the network dialog's Cancel button it was receiving an
implicit parameter value that's definitely not a timestamp:

```
[0x560f18af0c50 StButton.modal-dialog-linked-button:first-child hover ("Cancel")]
```

And as of today (or gjs >= 1.67.3) that's reported as an error:
```
JS ERROR: Error: Argument timestamp: value is out of range for uint32
popModal@resource:///org/gnome/shell/ui/main.js:638:12
popModal@resource:///org/gnome/shell/ui/modalDialog.js:206:14
close@resource:///org/gnome/shell/ui/modalDialog.js:179:14
```
and so you can't Cancel the dialog anymore.

Make sure `ModalDialog.close()` receives an `undefined` timestamp it
knows how to handle.

Fixes: https://bugs.launchpad.net/bugs/1918666
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1757>
This commit is contained in:
Daniel van Vugt 2021-03-12 14:13:18 +08:00
parent a24c1d28eb
commit c5b18ee66a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -937,7 +937,7 @@ class NMWirelessDialog extends ModalDialog.ModalDialog {
this.contentLayout.add_child(this._stack); this.contentLayout.add_child(this._stack);
this._disconnectButton = this.addButton({ action: this.close.bind(this), this._disconnectButton = this.addButton({ action: () => this.close(),
label: _("Cancel"), label: _("Cancel"),
key: Clutter.KEY_Escape }); key: Clutter.KEY_Escape });
this._connectButton = this.addButton({ action: this._connect.bind(this), this._connectButton = this.addButton({ action: this._connect.bind(this),