From e9584cfcab349f5791e5bdd23eab5cfe3e3b4a5b Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Mon, 18 Mar 2013 01:11:50 -0400
Subject: [PATCH] gdm: don't clear user-verifier on reset automatically

Right, the common code between the login screen and
the unlock screen handles clearing the user verifier
when GDM sends a reset.

We don't actually always want to clear the messages on
reset in the unlock case, though, so doing it implicitly
is problematic.

This commit moves the clear() call from the common code
to the specific reset handlers.

https://bugzilla.gnome.org/show_bug.cgi?id=694688
---
 js/gdm/loginDialog.js | 2 ++
 js/gdm/util.js        | 2 --
 js/ui/unlockDialog.js | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index 373ddb5c6..0abd233cd 100644
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -691,6 +691,8 @@ const LoginDialog = new Lang.Class({
     },
 
     _reset: function() {
+        this._userVerifier.clear();
+
         this._updateSensitivity(true);
         this._promptMessage.hide();
         this._user = null;
diff --git a/js/gdm/util.js b/js/gdm/util.js
index 6b69f33ee..4de22e416 100644
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@@ -346,8 +346,6 @@ const ShellUserVerifier = new Lang.Class({
     },
 
     _onReset: function() {
-        this.clear();
-
         // Clear previous attempts to authenticate
         this._failCounter = 0;
 
diff --git a/js/ui/unlockDialog.js b/js/ui/unlockDialog.js
index 29825323e..70452a8de 100644
--- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@@ -255,6 +255,7 @@ const UnlockDialog = new Lang.Class({
     },
 
     _onReset: function() {
+        this._userVerifier.clear();
         this.emit('failed');
     },