[gnome-shell] loginDialog: Make sure timed login indicator is shown after idle timeout

[Ray Strode <halfline src gnome org>]

commit 86a741c1eeca17b73622d79df0eabe54fa4a06c9
Author: verdre <gitlab v0yd nl>
Date:   Tue Apr 17 22:51:40 2018 +0200

    loginDialog: Make sure timed login indicator is shown after idle timeout
    
    If the idle timeout is done, always show the user list to make sure the
    timed login indicator is visible.

 js/gdm/loginDialog.js | 8 ++++++++
 1 file changed, 8 insertions(+)
---
diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index eb8465c59..22d9202ff 100644
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -1052,6 +1052,11 @@ var LoginDialog = new Lang.Class({
                      this._blockTimedLoginUntilIdle,
 
                      () => {
+                         // If idle timeout is done, make sure the timed login indicator is shown
+                         if (this._timedLoginDelay > _TIMED_LOGIN_IDLE_THRESHOLD &&
+                             this._authPrompt.actor.visible)
+                             this._authPrompt.cancel();
+
                          if (this._timedLoginDelay > _TIMED_LOGIN_IDLE_THRESHOLD || firstRun) {
                              this._userList.scrollToItem(this._timedLoginItem);
                              this._timedLoginItem.actor.grab_key_focus();
@@ -1071,6 +1076,9 @@ var LoginDialog = new Lang.Class({
     },
 
     _onTimedLoginRequested(client, userName, seconds) {
+        if (this._timedLoginBatch)
+            return;
+
         this._startTimedLogin(userName, seconds);
 
         // Restart timed login on user interaction