From 62ce90795f6bf96d75149dc34c19279da49a0c2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Tue, 23 Oct 2012 15:49:25 +0200
Subject: [PATCH] userMenu: Remove explicit screen lock on suspend

This is now handled by the screen shield itself.

https://bugzilla.gnome.org/show_bug.cgi?id=686482
---
 js/ui/userMenu.js | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/js/ui/userMenu.js b/js/ui/userMenu.js
index 1ead590ed..9bffe67d9 100644
--- a/js/ui/userMenu.js
+++ b/js/ui/userMenu.js
@@ -26,7 +26,6 @@ const PRIVACY_SCHEMA = 'org.gnome.desktop.privacy'
 const DISABLE_USER_SWITCH_KEY = 'disable-user-switching';
 const DISABLE_LOCK_SCREEN_KEY = 'disable-lock-screen';
 const DISABLE_LOG_OUT_KEY = 'disable-log-out';
-const LOCK_ENABLED_KEY = 'lock-enabled';
 const ALWAYS_SHOW_LOG_OUT_KEY = 'always-show-log-out';
 const SHOW_FULL_NAME_IN_TOP_BAR_KEY = 'show-full-name-in-top-bar';
 
@@ -872,18 +871,8 @@ const UserMenuButton = new Lang.Class({
             this._suspendOrPowerOffItem.state == PopupMenu.PopupAlternatingMenuItemState.DEFAULT) {
             this._session.ShutdownRemote();
         } else {
-            if (this._screenSaverSettings.get_boolean(LOCK_ENABLED_KEY)) {
-                let tmpId = Main.screenShield.connect('lock-screen-shown', Lang.bind(this, function() {
-                    Main.screenShield.disconnect(tmpId);
-
-                    this._loginManager.suspend();
-                }));
-
-                this.menu.close(BoxPointer.PopupAnimation.NONE);
-                Main.screenShield.lock(true);
-            } else {
-                this._loginManager.suspend();
-            }
+            this.menu.close(BoxPointer.PopupAnimation.NONE);
+            this._loginManager.suspend();
         }
     }
 });