[gnome-shell] polkitAgent: Only set key focus to password entry after opening dialog

[Florian Müllner <fmuellner src gnome org>]

commit 70203b58ca5310313f01cf8ae6719ae9176c68db
Author: Jonas Dreßler <verdre v0yd nl>
Date:   Mon Jun 24 10:57:24 2019 +0200

    polkitAgent: Only set key focus to password entry after opening dialog
    
    Set the key focus to the password field only after we got a request
    (and therefore know that a password is requested) instead of using
    `setInitialKeyFocus()`. This way we don't try to focus the password
    field by default if we aren't showing it (e.g. in case the user has no
    password or is using fingerprint login).
    
    Also we have to move the call to `grab_key_focus()` to happen after
    `_ensureOpen()`, because otherwise the ModalDialog will set the focus to
    one of the buttons while opening itself.
    
    https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/788

 js/ui/components/polkitAgent.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/js/ui/components/polkitAgent.js b/js/ui/components/polkitAgent.js
index 30d04d5c5d..2393eff3e4 100644
--- a/js/ui/components/polkitAgent.js
+++ b/js/ui/components/polkitAgent.js
@@ -103,7 +103,6 @@ var AuthenticationDialog = GObject.registerClass({
         this._workSpinner = new Animation.Spinner(WORK_SPINNER_ICON_SIZE, true);
         this._passwordBox.add(this._workSpinner);
 
-        this.setInitialKeyFocus(this._passwordEntry);
         this._passwordBox.hide();
 
         this._errorMessageLabel = new St.Label({ style_class: 'prompt-dialog-error-label' });
@@ -260,9 +259,10 @@ var AuthenticationDialog = GObject.registerClass({
 
         this._passwordBox.show();
         this._passwordEntry.set_text('');
-        this._passwordEntry.grab_key_focus();
         this._updateSensitivity(true);
+
         this._ensureOpen();
+        this._passwordEntry.grab_key_focus();
     }
 
     _onSessionShowError(session, text) {