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

citadel #1

Closed
isa wants to merge 29 commits from citadel into citadel-45.0
pull from: citadel
merge into: isa:citadel-45.0
Conversation 0 Commits 29 Files Changed 68 +11 -13
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d3c6dd75bb - Show all commits

12
js/ui/unlockDialog.js
View File

@ -676,14 +676,16 @@ var UnlockDialog = GObject.registerClass({
} }
_ensureAuthPrompt() { _ensureAuthPrompt() {
if (!this._authPrompt) { if (this._authPrompt)
return;
this._authPrompt = new AuthPrompt.AuthPrompt(this._gdmClient, this._authPrompt = new AuthPrompt.AuthPrompt(this._gdmClient,
AuthPrompt.AuthPromptMode.UNLOCK_ONLY); AuthPrompt.AuthPromptMode.UNLOCK_ONLY);
this._authPrompt.connect('failed', this._fail.bind(this)); this._authPrompt.connect('failed', this._fail.bind(this));
this._authPrompt.connect('cancelled', this._fail.bind(this)); this._authPrompt.connect('cancelled', this._fail.bind(this));
this._authPrompt.connect('reset', this._onReset.bind(this)); this._authPrompt.connect('reset', this._onReset.bind(this));
this._promptBox.add_child(this._authPrompt); this._promptBox.add_child(this._authPrompt);
}
this._authPrompt.reset(); this._authPrompt.reset();
this._authPrompt.updateSensitivity(true); this._authPrompt.updateSensitivity(true);
@ -870,11 +872,7 @@ var UnlockDialog = GObject.registerClass({
} }
finish(onComplete) { finish(onComplete) {
if (!this._authPrompt) { this._ensureAuthPrompt();
onComplete();
return;
}
this._authPrompt.finish(onComplete); this._authPrompt.finish(onComplete);
} }