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

screenShield: Rename _liftShield to _activateDialog

Browse Source 
Lifting the shield is now what happens *after* successfully logging
in, not before. Now, what we do is activate the dialog before logging
in.

Rename the method to reflect that.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872
This commit is contained in:
Georges Basile Stavracas Neto 2020-01-30 11:30:55 -03:00 committed by Florian Müllner
parent 7851069d9c
commit cd09144069
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/ui/screenShield.js
View File

@ -86,14 +86,14 @@ var ScreenShield = class {
this._smartcardManager.connect('smartcard-inserted', this._smartcardManager.connect('smartcard-inserted',
(manager, token) => { (manager, token) => {
if (this._isLocked && token.UsedToLogin) if (this._isLocked && token.UsedToLogin)
this._liftShield(); this._activateDialog();
}); });
this._oVirtCredentialsManager = OVirt.getOVirtCredentialsManager(); this._oVirtCredentialsManager = OVirt.getOVirtCredentialsManager();
this._oVirtCredentialsManager.connect('user-authenticated', this._oVirtCredentialsManager.connect('user-authenticated',
() => { () => {
if (this._isLocked) if (this._isLocked)
this._liftShield(); this._activateDialog();
}); });
this._loginManager = LoginManager.getLoginManager(); this._loginManager = LoginManager.getLoginManager();
@ -157,7 +157,7 @@ var ScreenShield = class {
this._syncInhibitor(); this._syncInhibitor();
} }
_liftShield() { _activateDialog() {
if (this._isLocked) { if (this._isLocked) {
this._ensureUnlockDialog(true /* allowCancel */); this._ensureUnlockDialog(true /* allowCancel */);
this._dialog.activate(); this._dialog.activate();
@ -220,7 +220,7 @@ var ScreenShield = class {
GLib.unichar_isgraph(unichar)) GLib.unichar_isgraph(unichar))
this._dialog.addCharacter(unichar); this._dialog.addCharacter(unichar);
this._liftShield(); this._activateDialog();
return Clutter.EVENT_STOP; return Clutter.EVENT_STOP;
} }