brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gdm: disallow cancel after verification succeeds

Browse Source 
Once verification has succeeded, the train's already
left the building and we shouldn't allow canceling.

This commit renders the cancel button non-reactive
and makes the cancel function be a noop after
verification succeeds.

https://bugzilla.gnome.org/show_bug.cgi?id=740141
This commit is contained in:
Ray Strode 2014-10-05 16:27:00 -04:00 committed by Michael Catanzaro
parent 86618ce1f9
commit 047e454a7c
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/gdm/authPrompt.js
View File

@ -260,6 +260,7 @@ const AuthPrompt = new Lang.Class({
_onVerificationComplete: function() { _onVerificationComplete: function() {
this.verificationStatus = AuthPromptStatus.VERIFICATION_SUCCEEDED; this.verificationStatus = AuthPromptStatus.VERIFICATION_SUCCEEDED;
this.cancelButton.reactive = false;
}, },
_onReset: function() { _onReset: function() {
@ -431,6 +432,7 @@ const AuthPrompt = new Lang.Class({
reset: function() { reset: function() {
let oldStatus = this.verificationStatus; let oldStatus = this.verificationStatus;
this.verificationStatus = AuthPromptStatus.NOT_VERIFYING; this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
this.cancelButton.reactive = true;
if (oldStatus == AuthPromptStatus.VERIFYING) if (oldStatus == AuthPromptStatus.VERIFYING)
this._userVerifier.cancel(); this._userVerifier.cancel();
@ -499,6 +501,9 @@ const AuthPrompt = new Lang.Class({
}, },
cancel: function() { cancel: function() {
if (this.verificationStatus == AuthPromptStatus.NOT_VERIFYING || this.verificationStatus == AuthPromptStatus.VERIFICATION_SUCCEEDED) {
return;
}
this.reset(); this.reset();
this.emit('cancelled'); this.emit('cancelled');
} }