[gnome-shell/T29763: 205/249] fixup! payg: Add a new screen to allow unlocking PAYG machines



commit 0d2f4de2f1b59dbb300a78920d4acde4279eb8de
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Tue Apr 7 17:53:13 2020 -0300

    fixup! payg: Add a new screen to allow unlocking PAYG machines
    
    We need to push the session mode before picking the unlock dialog
    constructor, otherwise we get the *wrong* unlock dialog.
    
    https://phabricator.endlessm.com/T29698

 js/ui/screenShield.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 6a9b39c030..d7523181a6 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -608,10 +608,6 @@ var ScreenShield = class {
         if (this._activationTime == 0)
             this._activationTime = GLib.get_monotonic_time();
 
-        this._ensureUnlockDialog(true);
-
-        this.actor.show();
-
         if (Main.sessionMode.currentMode !== 'unlock-dialog' &&
             Main.sessionMode.currentMode !== 'unlock-dialog-payg') {
             this._isGreeter = Main.sessionMode.isGreeter;
@@ -627,6 +623,10 @@ var ScreenShield = class {
             }
         }
 
+        this._ensureUnlockDialog(true);
+
+        this.actor.show();
+
         this._resetLockScreen({ animateLockScreen: animate,
                                 fadeToBlack: true });
         // On wayland, a crash brings down the entire session, so we don't


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]