From a2a5f5df3fdbaa8cd676dae196ad974c68ba0da7 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Mon, 29 Jul 2013 14:23:45 -0400 Subject: [PATCH] gdmUtil: pave way for fingeprint to optionally be default auth service Currently, fingerprint authentication is always a secondary thing. If a user wants to swipe their finger when the computer is asking for a password, so be it. This commit paves the way for making fingerprint auth optionally be the main way to authenticate. Currently there's no way to enable this, but in a future commit will honor enable-password-authentication=false in gsettings. https://bugzilla.gnome.org/show_bug.cgi?id=683437 --- js/gdm/util.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/js/gdm/util.js b/js/gdm/util.js index eba8b27ea..f41b2b2f8 100644 --- a/js/gdm/util.js +++ b/js/gdm/util.js @@ -375,17 +375,17 @@ const ShellUserVerifier = new Lang.Class({ }, _onInfo: function(client, serviceName, info) { - // We don't display fingerprint messages, because they - // have words like UPEK in them. Instead we use the messages - // as a cue to display our own message. - if (serviceName == FINGERPRINT_SERVICE_NAME && + if (this.serviceIsForeground(serviceName)) { + this._queueMessage(info, 'login-dialog-message-info'); + } else if (serviceName == FINGERPRINT_SERVICE_NAME && this._haveFingerprintReader) { + // We don't show fingerprint messages directly since it's + // not the main auth service. Instead we use the messages + // as a cue to display our own message. // Translators: this message is shown below the password entry field // to indicate the user can swipe their finger instead this.emit('show-login-hint', _("(or swipe finger)")); - } else if (this.serviceIsForeground(serviceName)) { - this._queueMessage(info, 'login-dialog-message-info'); } },