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

gdm: Merge clear() and cancel()

Browse Source 
cancel() isn't used anymore.
This commit is contained in:
Jasper St. Pierre 2014-03-07 18:49:41 -05:00
parent 84431cbc65
commit 056375cbcf
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/gdm/util.js
View File

@ -193,16 +193,6 @@ const ShellUserVerifier = new Lang.Class({
} }
}, },
cancel: function() {
if (this._cancellable)
this._cancellable.cancel();
if (this._userVerifier) {
this._userVerifier.call_cancel_sync(null);
this.clear();
}
},
clear: function() { clear: function() {
if (this._cancellable) { if (this._cancellable) {
this._cancellable.cancel(); this._cancellable.cancel();
@ -210,6 +200,7 @@ const ShellUserVerifier = new Lang.Class({
} }
if (this._userVerifier) { if (this._userVerifier) {
this._userVerifier.call_cancel_sync(null);
this._userVerifier.run_dispose(); this._userVerifier.run_dispose();
this._userVerifier = null; this._userVerifier = null;
} }
@ -531,7 +522,7 @@ const ShellUserVerifier = new Lang.Class({
if (canRetry) if (canRetry)
this._retry(); this._retry();
else else
this.cancel(); this.clear();
})); }));
}, },