summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Müllner <fmuellner@gnome.org>2012-09-28 16:52:12 (GMT)
committerFlorian Müllner <fmuellner@gnome.org>2012-10-04 06:57:55 (GMT)
commit0e01a81219e16969011860be134bccd111930368 (patch)
tree48dc9bfa2eabbe8966c4ae1dc2a81744d33bf900
parent36edf2027335a8dbb4de2e9c9ea6728c9d7835b3 (diff)
downloadgnome-shell-0e01a81219e16969011860be134bccd111930368.zip
gnome-shell-0e01a81219e16969011860be134bccd111930368.tar.xz
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
-rw-r--r--js/ui/userMenu.js5
1 files changed, 1 insertions, 4 deletions
diff --git a/js/ui/userMenu.js b/js/ui/userMenu.js
index 6ed2e84..cfa105a 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() {