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

gdm: Remove _cancelAndReset

Browse Source 
Calling Cancel(); on the UserVerifier will make us get a reset
signal eventually, so simply wait for the natural flow.
This commit is contained in:
Jasper St. Pierre 2014-03-07 15:48:39 -05:00
parent 5eb377bd3b
commit 5b4337f716
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/gdm/util.js
View File

@ -487,11 +487,6 @@ const ShellUserVerifier = new Lang.Class({
this.emit('verification-complete'); this.emit('verification-complete');
}, },
_cancelAndReset: function() {
this.cancel();
this._onReset();
},
_retry: function() { _retry: function() {
this.begin(this._userName, new Batch.Hold()); this.begin(this._userName, new Batch.Hold());
}, },
@ -518,12 +513,12 @@ const ShellUserVerifier = new Lang.Class({
} }
} else { } else {
if (!this.hasPendingMessages) { if (!this.hasPendingMessages) {
this._cancelAndReset(); this.cancel();
} else { } else {
let signalId = this.connect('no-more-messages', let signalId = this.connect('no-more-messages',
Lang.bind(this, function() { Lang.bind(this, function() {
this.disconnect(signalId); this.disconnect(signalId);
this._cancelAndReset(); this.cancel();
})); }));
} }
} }