From 077a1d23091daac03d3fdd22edded58df8653345 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Tue, 11 Feb 2020 10:27:36 -0300 Subject: [PATCH] authPrompt: Refactor 'next' signal Currently, AuthPrompt is connecting to its own 'next' signal signal to react to any of the entries being activated, and do some actions like starting the spinner and answering the PAM question. Refactor this code into another method, and don't connect to our own signal. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/922 --- js/gdm/authPrompt.js | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js index 13c7025c3..ff04af639 100644 --- a/js/gdm/authPrompt.js +++ b/js/gdm/authPrompt.js @@ -73,15 +73,6 @@ var AuthPrompt = GObject.registerClass({ this._userVerifier.connect('ovirt-user-authenticated', this._onOVirtUserAuthenticated.bind(this)); this.smartcardDetected = this._userVerifier.smartcardDetected; - this.connect('next', () => { - this.updateSensitivity(false); - this.startSpinning(); - if (this._queryingService) - this._userVerifier.answerQuery(this._queryingService, this._entry.text); - else - this._preemptiveAnswer = this._entry.text; - }); - this.connect('destroy', this._onDestroy.bind(this)); this._userWell = new St.Bin({ @@ -167,7 +158,7 @@ var AuthPrompt = GObject.registerClass({ entry.clutter_text.connect('activate', () => { if (entry.reactive) - this.emit('next'); + this._activateNext(); }); }); @@ -186,6 +177,17 @@ var AuthPrompt = GObject.registerClass({ this._defaultButtonWell.add_child(this._spinner); } + _activateNext() { + this.updateSensitivity(false); + this.startSpinning(); + if (this._queryingService) + this._userVerifier.answerQuery(this._queryingService, this._entry.text); + else + this._preemptiveAnswer = this._entry.text; + + this.emit('next'); + } + _updateEntry(secret) { if (secret && this._entry !== this._passwordEntry) { this._mainBox.replace_child(this._entry, this._passwordEntry);