From 5b4337f71609b66c6b6e831f8f478b585f2cf961 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Fri, 7 Mar 2014 15:48:39 -0500
Subject: [PATCH] gdm: Remove _cancelAndReset

Calling Cancel(); on the UserVerifier will make us get a reset
signal eventually, so simply wait for the natural flow.
---
 js/gdm/util.js | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/js/gdm/util.js b/js/gdm/util.js
index 78dae280d..0a307f495 100644
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@@ -487,11 +487,6 @@ const ShellUserVerifier = new Lang.Class({
         this.emit('verification-complete');
     },
 
-    _cancelAndReset: function() {
-        this.cancel();
-        this._onReset();
-    },
-
     _retry: function() {
         this.begin(this._userName, new Batch.Hold());
     },
@@ -518,12 +513,12 @@ const ShellUserVerifier = new Lang.Class({
             }
         } else {
             if (!this.hasPendingMessages) {
-                this._cancelAndReset();
+                this.cancel();
             } else {
                 let signalId = this.connect('no-more-messages',
                                             Lang.bind(this, function() {
                                                 this.disconnect(signalId);
-                                                this._cancelAndReset();
+                                                this.cancel();
                                             }));
             }
         }