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

LoginDialog: clear previous auth failed messages when trying again

Browse Source 
When the user has the entered the password for the second time
and clicked OK, clear messages from the previous attempt, so any
new failure is shown clearly.

https://bugzilla.gnome.org/show_bug.cgi?id=687132
This commit is contained in:
Giovanni Campagna 2012-10-29 17:39:00 +01:00
parent 9d31576cf5
commit 04debd1623
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/gdm/loginDialog.js
View File

@ -839,9 +839,13 @@ const LoginDialog = new Lang.Class({
}, },
_showMessage: function(userVerifier, message, styleClass) { _showMessage: function(userVerifier, message, styleClass) {
this._promptMessage.text = message; if (message) {
this._promptMessage.styleClass = styleClass; this._promptMessage.text = message;
GdmUtil.fadeInActor(this._promptMessage); this._promptMessage.styleClass = styleClass;
GdmUtil.fadeInActor(this._promptMessage);
} else {
GdmUtil.fadeOutActor(this._promptMessage);
}
}, },
_showLoginHint: function(verifier, message) { _showLoginHint: function(verifier, message) {

3
js/gdm/util.js
View File

@ -125,6 +125,9 @@ const ShellUserVerifier = new Lang.Class({
}, },
answerQuery: function(serviceName, answer) { answerQuery: function(serviceName, answer) {
// Clear any previous message
this.emit('show-message', null, null);
this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null); this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null);
}, },

10
js/ui/unlockDialog.js
View File

@ -208,9 +208,13 @@ const UnlockDialog = new Lang.Class({
}, },
_showMessage: function(userVerifier, message, styleClass) { _showMessage: function(userVerifier, message, styleClass) {
this._promptMessage.text = message; if (message) {
this._promptMessage.styleClass = styleClass; this._promptMessage.text = message;
GdmUtil.fadeInActor(this._promptMessage); this._promptMessage.styleClass = styleClass;
GdmUtil.fadeInActor(this._promptMessage);
} else {
GdmUtil.fadeOutActor(this._promptMessage);
}
}, },
_onAskQuestion: function(verifier, serviceName, question, passwordChar) { _onAskQuestion: function(verifier, serviceName, question, passwordChar) {