From 0e01a81219e16969011860be134bccd111930368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Fri, 28 Sep 2012 18:52:12 +0200 Subject: [PATCH] userMenu: Remove 'Switch Session' item GDM does not allow concurrent logins of a single user, so making 'Switch Session' a user switch operation does not work - in order to choose a different session, users have to log out. Rather than making 'Switch Session' an alias of 'Log out' (which is available anyway when multiple sessions are defined), remove the item altogether - 'Switch Session' suggests an operation that does not loose state, and we currently favor 'Switch Session' over 'Switch User', so on systems that have both multiple users and multiple sessions, the latter would become unavailable. https://bugzilla.gnome.org/show_bug.cgi?id=685062 --- js/ui/userMenu.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/js/ui/userMenu.js b/js/ui/userMenu.js index 6ed2e8443..cfa105ae8 100644 --- a/js/ui/userMenu.js +++ b/js/ui/userMenu.js @@ -613,11 +613,8 @@ const UserMenuButton = new Lang.Class({ _updateSwitchUser: function() { let allowSwitch = !this._lockdownSettings.get_boolean(DISABLE_USER_SWITCH_KEY); let multiUser = this._userManager.can_switch() && this._userManager.has_multiple_users; - let multiSession = Gdm.get_session_ids().length > 1; - this._loginScreenItem.label.set_text(multiUser ? _("Switch User") - : _("Switch Session")); - this._loginScreenItem.actor.visible = allowSwitch && (multiUser || multiSession); + this._loginScreenItem.actor.visible = allowSwitch && multiUser; }, _updateLogout: function() {