[gnome-shell/wip/login-unlock-merge: 9/9] sessionMode: drop unlock dialog

[Ray Strode <halfline src gnome org>]

commit 2a9553c398d98758066011e199221905394797aa
Author: Ray Strode <rstrode redhat com>
Date:   Mon Jul 8 23:40:43 2013 -0400

    sessionMode: drop unlock dialog
    
    Now that the login dialog can do the bits that the unlock dialog
    could do before we can drop the unlock dialog completely.

 js/Makefile.am        |    1 -
 js/ui/screenShield.js |    7 +-
 js/ui/sessionMode.js  |    2 +-
 js/ui/unlockDialog.js |  298 -------------------------------------------------
 4 files changed, 3 insertions(+), 305 deletions(-)
---
diff --git a/js/Makefile.am b/js/Makefile.am
index 4216df8..97ab331 100644
--- a/js/Makefile.am
+++ b/js/Makefile.am
@@ -97,7 +97,6 @@ nobase_dist_js_DATA =         \
        ui/status/bluetooth.js  \
        ui/switcherPopup.js     \
        ui/tweener.js           \
-       ui/unlockDialog.js      \
        ui/userMenu.js          \
        ui/userWidget.js        \
        ui/viewSelector.js      \
diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index ec0408f..43587fa 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -1039,7 +1039,7 @@ const ScreenShield = new Lang.Class({
 
     _lockScreenShown: function() {
         if (this._dialog && !this._isGreeter) {
-            this._dialog.destroy();
+            this._dialog.actor.destroy();
             this._dialog = null;
         }
 
@@ -1136,9 +1136,6 @@ const ScreenShield = new Lang.Class({
         if (Main.sessionMode.currentMode == 'unlock-dialog')
             Main.sessionMode.popMode('unlock-dialog');
 
-        if (this._dialog && !this._isGreeter)
-            this._dialog.popModal();
-
         if (this._isModal) {
             Main.popModal(this.actor);
             this._isModal = false;
@@ -1156,7 +1153,7 @@ const ScreenShield = new Lang.Class({
 
     _completeDeactivate: function() {
         if (this._dialog && !this._isGreeter) {
-            this._dialog.destroy();
+            this._dialog.actor.destroy();
             this._dialog = null;
         }
 
diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js
index 4c849ab..4b2c9fb 100644
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@@ -90,7 +90,7 @@ const _modes = {
         hasNotifications: true,
         isLocked: false,
         isPrimary: true,
-        unlockDialog: imports.ui.unlockDialog.UnlockDialog,
+        unlockDialog: imports.gdm.loginDialog.LoginDialog,
         components: ['networkAgent', 'polkitAgent', 'telepathyClient',
                      'keyring', 'recorder', 'autorunManager', 'automountManager'],
         panel: {