gdm: Remove _cancelAndReset

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

View File

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