From 66170a7b58292ae628a5e141a9f2a95e2b775fdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@redhat.com>
Date: Wed, 2 Jun 2021 18:22:29 +0200
Subject: [PATCH] Fix regression in AuthList rebase

Resolves: #1966841
---
 gnome-shell.spec                   |  6 +++++-
 support-choicelist-extension.patch | 18 ++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/gnome-shell.spec b/gnome-shell.spec
index 2f05cf8..ae07fa6 100644
--- a/gnome-shell.spec
+++ b/gnome-shell.spec
@@ -2,7 +2,7 @@
 
 Name:           gnome-shell
 Version:        40.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Window management and application launching for GNOME
 
 License:        GPLv2+
@@ -246,6 +246,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de
 %{_mandir}/man1/gnome-shell.1*
 
 %changelog
+* Wed Jun 02 2021 Florian Müllner <fmuellner@redhat.com> - 40.1-4
+- Fix regression in AuthList rebase
+  Resolves: #1966841
+
 * Thu May 27 2021 Florian Müllner <fmuellner@redhat.com> - 40.1-3
 - Update generated stylesheets
   Resolves: #1965327
diff --git a/support-choicelist-extension.patch b/support-choicelist-extension.patch
index 52d8a08..ac6232d 100644
--- a/support-choicelist-extension.patch
+++ b/support-choicelist-extension.patch
@@ -234,7 +234,7 @@ index e65e0e9cf..b2c603a55 100644
 2.31.1
 
 
-From 93bf4dffcd3d7790428bdc9c3398a50a6538b055 Mon Sep 17 00:00:00 2001
+From 79c8beffbdabc7d0948bb7335f67ada441e68b4e Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode@redhat.com>
 Date: Mon, 17 Jul 2017 16:48:03 -0400
 Subject: [PATCH 2/2] gdmUtil: enable support for GDM's ChoiceList PAM
@@ -242,14 +242,14 @@ Subject: [PATCH 2/2] gdmUtil: enable support for GDM's ChoiceList PAM
 
 This commit hooks up support for GDM's ChoiceList PAM extension.
 ---
- js/gdm/authPrompt.js  | 71 +++++++++++++++++++++++++++++++++++++++++++
- js/gdm/loginDialog.js |  5 +++
- js/gdm/util.js        | 28 +++++++++++++++++
+ js/gdm/authPrompt.js  | 69 +++++++++++++++++++++++++++++++++++++++++++
+ js/gdm/loginDialog.js |  5 ++++
+ js/gdm/util.js        | 28 ++++++++++++++++++
  js/ui/unlockDialog.js |  7 +++++
- 4 files changed, 111 insertions(+)
+ 4 files changed, 109 insertions(+)
 
 diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js
-index 84c608b2f..4b889d8b5 100644
+index 84c608b2f..b25897ea7 100644
 --- a/js/gdm/authPrompt.js
 +++ b/js/gdm/authPrompt.js
 @@ -4,6 +4,7 @@
@@ -326,12 +326,11 @@ index 84c608b2f..4b889d8b5 100644
      }
  
      setQuestion(question) {
-@@ -448,10 +487,41 @@ var AuthPrompt = GObject.registerClass({
+@@ -448,10 +487,39 @@ var AuthPrompt = GObject.registerClass({
  
          this._entry.hint_text = question;
  
 +        this._authList.hide();
-+        this._label.show();
          this._entry.show();
          this._entry.grab_key_focus();
      }
@@ -358,7 +357,6 @@ index 84c608b2f..4b889d8b5 100644
 +            this._authList.addItem(key, text);
 +        }
 +
-+        this._label.hide();
 +        this._entry.hide();
 +        if (this._message.text == '')
 +            this._message.hide();
@@ -368,7 +366,7 @@ index 84c608b2f..4b889d8b5 100644
      getAnswer() {
          let text;
  
-@@ -487,6 +557,7 @@ var AuthPrompt = GObject.registerClass({
+@@ -487,6 +555,7 @@ var AuthPrompt = GObject.registerClass({
          else
              this._message.remove_style_class_name('login-dialog-message-hint');