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

loginDialog: don't ever call _reset directly

Browse Source 
The only time we ever call _reset directly is when
detecting changes to disable-user-list.  We can implicitly
trigger a reset for this case, just as easily by calling
this._authPrompt.reset()

This commit makes that change for consistency and to make
it easier to adjust the authprompt workflow later.

https://bugzilla.gnome.org/show_bug.cgi?id=683437
This commit is contained in:
Ray Strode 2013-07-28 15:55:09 -04:00
parent 69957dac3d
commit 925eaa1db0
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/gdm/loginDialog.js
View File

@ -451,7 +451,7 @@ const LoginDialog = new Lang.Class({
this._authPrompt = new AuthPrompt.AuthPrompt(gdmClient, AuthPrompt.AuthPromptMode.UNLOCK_OR_LOG_IN); this._authPrompt = new AuthPrompt.AuthPrompt(gdmClient, AuthPrompt.AuthPromptMode.UNLOCK_OR_LOG_IN);
this._authPrompt.connect('prompted', Lang.bind(this, this._onPrompted)); this._authPrompt.connect('prompted', Lang.bind(this, this._onPrompted));
this._authPrompt.connect('reset', Lang.bind(this, this._reset)); this._authPrompt.connect('reset', Lang.bind(this, this._onReset));
this._authPrompt.hide(); this._authPrompt.hide();
this._authPrompt.actor.add_constraint(new Clutter.AlignConstraint({ source: this.actor, this._authPrompt.actor.add_constraint(new Clutter.AlignConstraint({ source: this.actor,
@ -530,7 +530,7 @@ const LoginDialog = new Lang.Class({
this._disableUserList = disableUserList; this._disableUserList = disableUserList;
if (!this._authPrompt.verifyingUser) if (!this._authPrompt.verifyingUser)
this._reset(); this._authPrompt.reset();
} }
}, },
@ -575,10 +575,7 @@ const LoginDialog = new Lang.Class({
this._showPrompt(); this._showPrompt();
}, },
_reset: function() { _onReset: function() {
if (this._authPrompt.verifyingUser)
return;
this._sessionMenuButton.updateSensitivity(true); this._sessionMenuButton.updateSensitivity(true);
this._user = null; this._user = null;