[gnome-shell/wip/background-rework: 1/13] loginDialog: fix cancel from "Not Listed?"

[Ray Strode <halfline src gnome org>]

commit 360f1cf26ad65e18c384a0996df097e646fe2d3f
Author: Ray Strode <rstrode redhat com>
Date:   Wed Feb 6 17:40:02 2013 -0500

    loginDialog: fix cancel from "Not Listed?"
    
    Since commit 1ae0fadbf483128e27565baba6e8684bc5defca2 we
    no longer start a PAM conversation as soon as the user clicks
    the "Not Listed?" button.  Instead we defer starting the PAM
    conversation until the user types their username.
    
    Unfortunately, the cancel button resets the dialog back to the
    user list indrectly by cancelling the current PAM conversation.
    
    This means if the user hasn't yet entered thier username then
    the cancel button doesn't work.
    
    This commit performs a direct dialog reset in the case the
    PAM conversation hasn't been started yet.

 js/gdm/loginDialog.js |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index 6bdd9af..b24b259 100644
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -890,7 +890,10 @@ const LoginDialog = new Lang.Class({
     },
 
     cancel: function() {
-        this._userVerifier.cancel();
+        if (this._verifyingUser)
+            this._userVerifier.cancel();
+        else
+            this._reset();
     },
 
     _fadeInPrompt: function() {