[gnome-shell] unlockDialog: don't unlock explicitly on verification-complete
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] unlockDialog: don't unlock explicitly on verification-complete
- Date: Thu, 18 Jul 2013 13:25:05 +0000 (UTC)
commit 55a04bbf2bd006d38047ca50ffdbdfe0f5b69f9b
Author: Ray Strode <rstrode redhat com>
Date: Wed Jul 17 16:42:33 2013 -0400
unlockDialog: don't unlock explicitly on verification-complete
logind sends out an "unlock" signal separately when
verification completes and we already listen for that,
so we don't need to unlock on verification-complete, too.
https://bugzilla.gnome.org/show_bug.cgi?id=704347
js/ui/screenShield.js | 5 -----
js/ui/unlockDialog.js | 14 --------------
2 files changed, 0 insertions(+), 19 deletions(-)
---
diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 3588547..d7bf461 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -927,7 +927,6 @@ const ScreenShield = new Lang.Class({
}
this._dialog.connect('failed', Lang.bind(this, this._onUnlockFailed));
- this._dialog.connect('unlocked', Lang.bind(this, this._onUnlockSucceded));
}
this._dialog.allowCancel = allowCancel;
@@ -937,10 +936,6 @@ const ScreenShield = new Lang.Class({
this._resetLockScreen(true, false);
},
- _onUnlockSucceded: function() {
- this.deactivate(true);
- },
-
_resetLockScreen: function(animateLockScreen, animateLockDialog) {
// Don't reset the lock screen unless it is completely hidden
// This prevents the shield going down if the lock-delay timeout
diff --git a/js/ui/unlockDialog.js b/js/ui/unlockDialog.js
index f09a09b..e2646ea 100644
--- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@@ -223,22 +223,8 @@ const UnlockDialog = new Lang.Class({
this._userVerifier.answerQuery(query, this._promptEntry.text);
},
- _finishUnlock: function() {
- this._userVerifier.clear();
- this.emit('unlocked');
- },
-
_onVerificationComplete: function() {
this._userVerified = true;
- if (!this._userVerifier.hasPendingMessages) {
- this._finishUnlock();
- } else {
- let signalId = this._userVerifier.connect('no-more-messages',
- Lang.bind(this, function() {
- this._userVerifier.disconnect(signalId);
- this._finishUnlock();
- }));
- }
},
_onReset: function() {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]