rpms/gnome-shell
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Use correct patch for fixing unlock screen confusion

Browse Source
This commit is contained in:
Ray Strode 2021-10-27 09:37:46 -04:00
parent 9fde33ec89
commit 811a58913d
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
0001-unlockDialog-Don-t-create-AuthDialog-just-to-finish-.patch
View File

@ -1,4 +1,4 @@
From 7a96d259209297b4fad57352abae0a45e7b192fc Mon Sep 17 00:00:00 2001 From 5d5bfe492cd81a081e80660761bac137d38133bd Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com> From: Ray Strode <rstrode@redhat.com>
Date: Fri, 8 Oct 2021 11:08:17 -0400 Date: Fri, 8 Oct 2021 11:08:17 -0400
Subject: [PATCH 1/2] unlockDialog: Don't create AuthDialog just to finish it Subject: [PATCH 1/2] unlockDialog: Don't create AuthDialog just to finish it
@ -8,6 +8,8 @@ created, the code currently creates one just to tell it to finish.
This commit changes the code to skip creating the auth dialog in This commit changes the code to skip creating the auth dialog in
that case. that case.
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1999>
--- ---
js/ui/unlockDialog.js | 6 +++++- js/ui/unlockDialog.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-) 1 file changed, 5 insertions(+), 1 deletion(-)
@ -84,5 +86,5 @@ index 370385abc..f4c76c41a 100644
this._isModal = false; this._isModal = false;
} }
-- --
2.31.1 2.32.0

25
0002-unlockDialog-Properly-reset-auth-prompt-when-showing.patch
View File

@ -1,4 +1,4 @@
From e45d8817b4fc5fed35d3b39612f7993351b7c92c Mon Sep 17 00:00:00 2001 From ceee53aa0a40f3bf81945fabb4ecdd70d11143a4 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com> From: Ray Strode <rstrode@redhat.com>
Date: Tue, 5 Oct 2021 11:01:19 -0400 Date: Tue, 5 Oct 2021 11:01:19 -0400
Subject: [PATCH 2/2] unlockDialog: Properly reset auth prompt when showing it Subject: [PATCH 2/2] unlockDialog: Properly reset auth prompt when showing it
@ -15,15 +15,17 @@ of a cancel animation.
This commit solves the problem by ensuring the auth prompt is always This commit solves the problem by ensuring the auth prompt is always
in a fresh reset state before showing it. in a fresh reset state before showing it.
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1999>
--- ---
js/ui/unlockDialog.js | 24 ++++++++++++------------ js/ui/unlockDialog.js | 18 ++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-) 1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/js/ui/unlockDialog.js b/js/ui/unlockDialog.js diff --git a/js/ui/unlockDialog.js b/js/ui/unlockDialog.js
index f4c76c41a..3e80c002a 100644 index f4c76c41a..3ef6aa90f 100644
--- a/js/ui/unlockDialog.js --- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js +++ b/js/ui/unlockDialog.js
@@ -649,73 +649,73 @@ var UnlockDialog = GObject.registerClass({ @@ -649,70 +649,68 @@ var UnlockDialog = GObject.registerClass({
} }
_updateBackgroundEffects() { _updateBackgroundEffects() {
@ -73,12 +75,8 @@ index f4c76c41a..3e80c002a 100644
+ this._promptBox.add_child(this._authPrompt); + this._promptBox.add_child(this._authPrompt);
+ } + }
- this._authPrompt.reset(); this._authPrompt.reset();
- this._authPrompt.updateSensitivity(true); this._authPrompt.updateSensitivity(true);
+ if (this._authPrompt.verificationStatus !== AuthPromptStatus.NOT_VERIFYING) {
+ this._authPrompt.reset();
+ this._authPrompt.updateSensitivity(true);
+ }
} }
_maybeDestroyAuthPrompt() { _maybeDestroyAuthPrompt() {
@ -106,9 +104,6 @@ index f4c76c41a..3e80c002a 100644
onComplete: () => this._maybeDestroyAuthPrompt(), onComplete: () => this._maybeDestroyAuthPrompt(),
}); });
} }
_showPrompt() {
this._ensureAuthPrompt();
-- --
2.31.1 2.32.0

5
gnome-shell.spec
View File

@ -2,7 +2,7 @@
Name: gnome-shell Name: gnome-shell
Version: 41.0 Version: 41.0
Release: 6%{?dist} Release: 7%{?dist}
Summary: Window management and application launching for GNOME Summary: Window management and application launching for GNOME
License: GPLv2+ License: GPLv2+
@ -249,6 +249,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de
%{_mandir}/man1/gnome-shell.1* %{_mandir}/man1/gnome-shell.1*
%changelog %changelog
* Wed Oct 27 2021 Ray Strode <rstrode@redhat.com> - 41.0-7
- Use correct patch for fixing unlock screen confusion
* Tue Oct 26 2021 Jonas Ådahl <jadahl@redhat.com> - 41.0-6 * Tue Oct 26 2021 Jonas Ådahl <jadahl@redhat.com> - 41.0-6
- Work around crashy tear down - Work around crashy tear down