unlockDialog: Stop passing timestamp to Main.pushModal()
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:
parent
fbc7290bcf
commit
0432623fc8
@ -427,8 +427,7 @@ export class ScreenShield extends Signals.EventEmitter {
|
||||
|
||||
this._dialog = new constructor(this._lockDialogGroup);
|
||||
|
||||
let time = global.get_current_time();
|
||||
if (!this._dialog.open(time)) {
|
||||
if (!this._dialog.open()) {
|
||||
// This is kind of an impossible error: we're already modal
|
||||
// by the time we reach this...
|
||||
log('Could not open login dialog: failed to acquire grab');
|
||||
|
@ -876,17 +876,14 @@ export const UnlockDialog = GObject.registerClass({
|
||||
this._authPrompt.finish(onComplete);
|
||||
}
|
||||
|
||||
open(timestamp) {
|
||||
open() {
|
||||
this.show();
|
||||
|
||||
if (this._isModal)
|
||||
return true;
|
||||
|
||||
let modalParams = {
|
||||
timestamp,
|
||||
actionMode: Shell.ActionMode.UNLOCK_SCREEN,
|
||||
};
|
||||
let grab = Main.pushModal(Main.uiGroup, modalParams);
|
||||
const grab = Main.pushModal(Main.uiGroup,
|
||||
{actionMode: Shell.ActionMode.UNLOCK_SCREEN});
|
||||
if (grab.get_seat_state() !== Clutter.GrabState.ALL) {
|
||||
Main.popModal(grab);
|
||||
return false;
|
||||
@ -902,9 +899,9 @@ export const UnlockDialog = GObject.registerClass({
|
||||
this._showPrompt();
|
||||
}
|
||||
|
||||
popModal(timestamp) {
|
||||
popModal() {
|
||||
if (this._isModal) {
|
||||
Main.popModal(this._grab, timestamp);
|
||||
Main.popModal(this._grab);
|
||||
this._grab = null;
|
||||
this._isModal = false;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user