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

unlockDialog: Stop passing timestamp to Main.pushModal()

Browse Source 
Since the move to Clutter.grab() in commit f4cae72d17af6, the
parameter doesn't do anything anymore.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3195>
This commit is contained in:
Florian Müllner 2024-02-17 00:12:51 +01:00 committed by Marge Bot
parent fbc7290bcf
commit 0432623fc8
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/ui/screenShield.js
View File

@ -427,8 +427,7 @@ export class ScreenShield extends Signals.EventEmitter {
this._dialog = new constructor(this._lockDialogGroup); this._dialog = new constructor(this._lockDialogGroup);
let time = global.get_current_time(); if (!this._dialog.open()) {
if (!this._dialog.open(time)) {
// This is kind of an impossible error: we're already modal // This is kind of an impossible error: we're already modal
// by the time we reach this... // by the time we reach this...
log('Could not open login dialog: failed to acquire grab'); log('Could not open login dialog: failed to acquire grab');

13
js/ui/unlockDialog.js
View File

@ -876,17 +876,14 @@ export const UnlockDialog = GObject.registerClass({
this._authPrompt.finish(onComplete); this._authPrompt.finish(onComplete);
} }
open(timestamp) { open() {
this.show(); this.show();
if (this._isModal) if (this._isModal)
return true; return true;
let modalParams = { const grab = Main.pushModal(Main.uiGroup,
timestamp, {actionMode: Shell.ActionMode.UNLOCK_SCREEN});
actionMode: Shell.ActionMode.UNLOCK_SCREEN,
};
let grab = Main.pushModal(Main.uiGroup, modalParams);
if (grab.get_seat_state() !== Clutter.GrabState.ALL) { if (grab.get_seat_state() !== Clutter.GrabState.ALL) {
Main.popModal(grab); Main.popModal(grab);
return false; return false;
@ -902,9 +899,9 @@ export const UnlockDialog = GObject.registerClass({
this._showPrompt(); this._showPrompt();
} }
popModal(timestamp) { popModal() {
if (this._isModal) { if (this._isModal) {
Main.popModal(this._grab, timestamp); Main.popModal(this._grab);
this._grab = null; this._grab = null;
this._isModal = false; this._isModal = false;
} }