From 4f66f096ff2d31da7bf0fae42a5d2490640ad69d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Fri, 5 Oct 2012 15:56:24 +0200
Subject: [PATCH] userMenu: Ignore 'lock-enabled' setting for user switching

The preference controls whether the screen should be locked when
the screensaver is activated, not whether the screen should be
locked at all. In particular after having switched to a different
user, log out should not automatically switch back to the unlocked
session, so always activate the lock when user switching.

https://bugzilla.gnome.org/show_bug.cgi?id=685536
---
 js/ui/userMenu.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/js/ui/userMenu.js b/js/ui/userMenu.js
index cfa105ae8..6eb445f97 100644
--- a/js/ui/userMenu.js
+++ b/js/ui/userMenu.js
@@ -824,8 +824,7 @@ const UserMenuButton = new Lang.Class({
     _onLoginScreenActivate: function() {
         this.menu.close(BoxPointer.PopupAnimation.NONE);
         Main.overview.hide();
-        if (this._screenSaverSettings.get_boolean(LOCK_ENABLED_KEY))
-            Main.screenShield.lock(false);
+        Main.screenShield.lock(false);
         Gdm.goto_login_session_sync(null);
     },