[gnome-shell/gnome-41] Revert !1999
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/gnome-41] Revert !1999
- Date: Thu, 4 Nov 2021 17:28:53 +0000 (UTC)
commit d3c6dd75bb490ab8ca24476b665b42e56b2f7902
Author: Florian Müllner <fmuellner gnome org>
Date: Thu Nov 4 14:07:34 2021 +0100
Revert !1999
The changes introduce crashes, so back out until we
figure those out.
This reverts commits ceee53aa0a4 and 5d5bfe492cd81.
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2022>
js/ui/unlockDialog.js | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
---
diff --git a/js/ui/unlockDialog.js b/js/ui/unlockDialog.js
index 3ef6aa90f0..370385abc4 100644
--- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@@ -676,14 +676,16 @@ var UnlockDialog = GObject.registerClass({
}
_ensureAuthPrompt() {
- if (!this._authPrompt) {
- this._authPrompt = new AuthPrompt.AuthPrompt(this._gdmClient,
- AuthPrompt.AuthPromptMode.UNLOCK_ONLY);
- this._authPrompt.connect('failed', this._fail.bind(this));
- this._authPrompt.connect('cancelled', this._fail.bind(this));
- this._authPrompt.connect('reset', this._onReset.bind(this));
- this._promptBox.add_child(this._authPrompt);
- }
+ if (this._authPrompt)
+ return;
+
+ this._authPrompt = new AuthPrompt.AuthPrompt(this._gdmClient,
+ AuthPrompt.AuthPromptMode.UNLOCK_ONLY);
+ this._authPrompt.connect('failed', this._fail.bind(this));
+ this._authPrompt.connect('cancelled', this._fail.bind(this));
+ this._authPrompt.connect('reset', this._onReset.bind(this));
+
+ this._promptBox.add_child(this._authPrompt);
this._authPrompt.reset();
this._authPrompt.updateSensitivity(true);
@@ -870,11 +872,7 @@ var UnlockDialog = GObject.registerClass({
}
finish(onComplete) {
- if (!this._authPrompt) {
- onComplete();
- return;
- }
-
+ this._ensureAuthPrompt();
this._authPrompt.finish(onComplete);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]