[gnome-shell/wip/wayland-gdm-cleanup: 17/19] gdm: Merge clear() and cancel()

[Jasper St. Pierre <jstpierre src gnome org>]

commit 056375cbcff1dbce846309462155c7a59ae6ad02
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Fri Mar 7 18:49:41 2014 -0500

    gdm: Merge clear() and cancel()
    
    cancel() isn't used anymore.

 js/gdm/util.js |   13 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)
---
diff --git a/js/gdm/util.js b/js/gdm/util.js
index bd9cf3d..076007e 100644
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@@ -193,16 +193,6 @@ const ShellUserVerifier = new Lang.Class({
         }
     },
 
-    cancel: function() {
-        if (this._cancellable)
-            this._cancellable.cancel();
-
-        if (this._userVerifier) {
-            this._userVerifier.call_cancel_sync(null);
-            this.clear();
-        }
-    },
-
     clear: function() {
         if (this._cancellable) {
             this._cancellable.cancel();
@@ -210,6 +200,7 @@ const ShellUserVerifier = new Lang.Class({
         }
 
         if (this._userVerifier) {
+            this._userVerifier.call_cancel_sync(null);
             this._userVerifier.run_dispose();
             this._userVerifier = null;
         }
@@ -531,7 +522,7 @@ const ShellUserVerifier = new Lang.Class({
             if (canRetry)
                 this._retry();
             else
-                this.cancel();
+                this.clear();
         }));
     },