From 0e739b38131a4898237cf57c921aa5c618c145b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Fri, 3 May 2024 14:04:37 +0200 Subject: [PATCH] Adjust downstream patch to mutter changes Resolves: RHEL-35337 --- disable-unlock-entry-until-question.patch | 34 +++++++++-------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/disable-unlock-entry-until-question.patch b/disable-unlock-entry-until-question.patch index b45f9ec..7859438 100644 --- a/disable-unlock-entry-until-question.patch +++ b/disable-unlock-entry-until-question.patch @@ -1,4 +1,4 @@ -From a3d52b89afd3e56c682d6aaf5cdabd2443e1fbc9 Mon Sep 17 00:00:00 2001 +From 8d327cbdbbc31604241dd25e411f042738b1de41 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 30 Sep 2015 12:51:24 -0400 Subject: [PATCH 1/3] authPrompt: don't fade out auth messages if user types @@ -28,7 +28,7 @@ index ec1c931e63..a67d0443c5 100644 2.44.0 -From 960be98ad1416de71430eebba76fd0bd94f16747 Mon Sep 17 00:00:00 2001 +From 7f684379789cfe3cbeda67cde89863fb719529c2 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 30 Sep 2015 14:36:33 -0400 Subject: [PATCH 2/3] authPrompt: don't spin unless answering question @@ -64,7 +64,7 @@ index a67d0443c5..36d26be7dc 100644 2.44.0 -From 7368f8100520bf84f7302ed6427bb91e5a55e8b1 Mon Sep 17 00:00:00 2001 +From 9d814b19e25c3b357261e206f9a93528d3aed5df Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Mon, 5 Oct 2015 15:26:18 -0400 Subject: [PATCH 3/3] authPrompt: stop accepting preemptive answer if user @@ -78,31 +78,23 @@ Typing ahead the password is just a convenience for users who don't want to manually lift the shift before typing their passwords, after all. --- - js/gdm/authPrompt.js | 37 +++++++++++++++++++++++++++++++++++++ - 1 file changed, 37 insertions(+) + js/gdm/authPrompt.js | 36 ++++++++++++++++++++++++++++++++++++ + 1 file changed, 36 insertions(+) diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js -index 36d26be7dc..9da6fcf497 100644 +index 36d26be7dc..3bfcd0d3db 100644 --- a/js/gdm/authPrompt.js +++ b/js/gdm/authPrompt.js -@@ -3,6 +3,7 @@ - import Clutter from 'gi://Clutter'; - import GLib from 'gi://GLib'; - import GObject from 'gi://GObject'; -+import Meta from 'gi://Meta'; - import Pango from 'gi://Pango'; - import Shell from 'gi://Shell'; - import St from 'gi://St'; -@@ -70,6 +71,8 @@ export const AuthPrompt = GObject.registerClass({ +@@ -70,6 +70,8 @@ export const AuthPrompt = GObject.registerClass({ this._defaultButtonWellActor = null; this._cancelledRetries = 0; -+ this._idleMonitor = Meta.IdleMonitor.get_core(); ++ this._idleMonitor = global.backend.get_core_idle_monitor(); + let reauthenticationOnly; if (this._mode === AuthPromptMode.UNLOCK_ONLY) reauthenticationOnly = true; -@@ -127,8 +130,14 @@ export const AuthPrompt = GObject.registerClass({ +@@ -127,8 +129,14 @@ export const AuthPrompt = GObject.registerClass({ } _onDestroy() { @@ -117,7 +109,7 @@ index 36d26be7dc..9da6fcf497 100644 this._userVerifier.destroy(); this._userVerifier = null; } -@@ -280,6 +289,11 @@ export const AuthPrompt = GObject.registerClass({ +@@ -280,6 +288,11 @@ export const AuthPrompt = GObject.registerClass({ this._userVerifier.answerQuery(this._queryingService, this._entry.text); } else { this._preemptiveAnswer = this._entry.text; @@ -129,7 +121,7 @@ index 36d26be7dc..9da6fcf497 100644 } this.emit('next'); -@@ -491,6 +505,11 @@ export const AuthPrompt = GObject.registerClass({ +@@ -491,6 +504,11 @@ export const AuthPrompt = GObject.registerClass({ } setQuestion(question) { @@ -141,7 +133,7 @@ index 36d26be7dc..9da6fcf497 100644 this._entry.hint_text = question; this._authList.hide(); -@@ -612,6 +631,19 @@ export const AuthPrompt = GObject.registerClass({ +@@ -612,6 +630,19 @@ export const AuthPrompt = GObject.registerClass({ this._updateEntry(false); } @@ -161,7 +153,7 @@ index 36d26be7dc..9da6fcf497 100644 reset() { let oldStatus = this.verificationStatus; this.verificationStatus = AuthPromptStatus.NOT_VERIFYING; -@@ -619,6 +651,11 @@ export const AuthPrompt = GObject.registerClass({ +@@ -619,6 +650,11 @@ export const AuthPrompt = GObject.registerClass({ this.cancelButton.can_focus = this._hasCancelButton; this._preemptiveAnswer = null;