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

gdm: Remove the hold from AuthPrompt / UserVerifier

Browse Source 
After the removal before, it's now unused.
This commit is contained in:
Jasper St. Pierre 2014-03-07 15:57:45 -05:00
parent 97e0175f48
commit 6d8d094e0c
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/gdm/authPrompt.js
View File

@ -472,16 +472,11 @@ const AuthPrompt = new Lang.Class({
}, },
begin: function(params) { begin: function(params) {
params = Params.parse(params, { userName: null, params = Params.parse(params, { userName: null });
hold: null });
this.updateSensitivity(false); this.updateSensitivity(false);
let hold = params.hold; this._userVerifier.begin(params.userName);
if (!hold)
hold = new Batch.Hold();
this._userVerifier.begin(params.userName, hold);
this.verificationStatus = AuthPromptStatus.VERIFYING; this.verificationStatus = AuthPromptStatus.VERIFYING;
}, },

13
js/gdm/util.js
View File

@ -163,9 +163,8 @@ const ShellUserVerifier = new Lang.Class({
Lang.bind(this, this._oVirtUserAuthenticated)); Lang.bind(this, this._oVirtUserAuthenticated));
}, },
begin: function(userName, hold) { begin: function(userName) {
this._cancellable = new Gio.Cancellable(); this._cancellable = new Gio.Cancellable();
this._hold = hold;
this._userName = userName; this._userName = userName;
this.reauthenticating = false; this.reauthenticating = false;
@ -315,7 +314,6 @@ const ShellUserVerifier = new Lang.Class({
_reportInitError: function(where, error) { _reportInitError: function(where, error) {
logError(error, where); logError(error, where);
this._hold.release();
this._queueMessage(_("Authentication error"), MessageType.ERROR); this._queueMessage(_("Authentication error"), MessageType.ERROR);
this._verificationFailed(false); this._verificationFailed(false);
@ -341,7 +339,6 @@ const ShellUserVerifier = new Lang.Class({
this.reauthenticating = true; this.reauthenticating = true;
this._connectSignals(); this._connectSignals();
this._beginVerification(); this._beginVerification();
this._hold.release();
}, },
_userVerifierGot: function(client, result) { _userVerifierGot: function(client, result) {
@ -356,7 +353,6 @@ const ShellUserVerifier = new Lang.Class({
this._connectSignals(); this._connectSignals();
this._beginVerification(); this._beginVerification();
this._hold.release();
}, },
_connectSignals: function() { _connectSignals: function() {
@ -396,7 +392,6 @@ const ShellUserVerifier = new Lang.Class({
}, },
_startService: function(serviceName) { _startService: function(serviceName) {
this._hold.acquire();
if (this._userName) { if (this._userName) {
this._userVerifier.call_begin_verification_for_user(serviceName, this._userVerifier.call_begin_verification_for_user(serviceName,
this._userName, this._userName,
@ -410,8 +405,6 @@ const ShellUserVerifier = new Lang.Class({
this._reportInitError('Failed to start verification for user', e); this._reportInitError('Failed to start verification for user', e);
return; return;
} }
this._hold.release();
})); }));
} else { } else {
this._userVerifier.call_begin_verification(serviceName, this._userVerifier.call_begin_verification(serviceName,
@ -425,8 +418,6 @@ const ShellUserVerifier = new Lang.Class({
this._reportInitError('Failed to start verification', e); this._reportInitError('Failed to start verification', e);
return; return;
} }
this._hold.release();
})); }));
} }
}, },
@ -493,7 +484,7 @@ const ShellUserVerifier = new Lang.Class({
}, },
_retry: function() { _retry: function() {
this.begin(this._userName, new Batch.Hold()); this.begin(this._userName);
}, },
_verificationFailed: function(retry) { _verificationFailed: function(retry) {