brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

userMenu: Hide "Log out" item on single user machines

Browse Source 
Ignoring remote logins, the "Log out" action is meaningless for
single user setups. Do not show it in that case.

https://bugzilla.gnome.org/show_bug.cgi?id=675802
This commit is contained in:
Florian Müllner 2012-05-10 13:16:15 +02:00
parent d955adbbad
commit 518282e169
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/ui/userMenu.js
View File

@ -497,13 +497,13 @@ const UserMenuButton = new Lang.Class({
})); }));
this._userManager.connect('notify::is-loaded', this._userManager.connect('notify::is-loaded',
Lang.bind(this, this._updateSwitchUser)); Lang.bind(this, this._updateMultiUser));
this._userManager.connect('notify::has-multiple-users', this._userManager.connect('notify::has-multiple-users',
Lang.bind(this, this._updateSwitchUser)); Lang.bind(this, this._updateMultiUser));
this._userManager.connect('user-added', this._userManager.connect('user-added',
Lang.bind(this, this._updateSwitchUser)); Lang.bind(this, this._updateMultiUser));
this._userManager.connect('user-removed', this._userManager.connect('user-removed',
Lang.bind(this, this._updateSwitchUser)); Lang.bind(this, this._updateMultiUser));
this._lockdownSettings.connect('changed::' + DISABLE_USER_SWITCH_KEY, this._lockdownSettings.connect('changed::' + DISABLE_USER_SWITCH_KEY,
Lang.bind(this, this._updateSwitchUser)); Lang.bind(this, this._updateSwitchUser));
this._lockdownSettings.connect('changed::' + DISABLE_LOG_OUT_KEY, this._lockdownSettings.connect('changed::' + DISABLE_LOG_OUT_KEY,
@ -542,6 +542,11 @@ const UserMenuButton = new Lang.Class({
this._name.set_text(""); this._name.set_text("");
}, },
_updateMultiUser: function() {
this._updateSwitchUser();
this._updateLogout();
},
_updateSwitchUser: function() { _updateSwitchUser: function() {
let allowSwitch = !this._lockdownSettings.get_boolean(DISABLE_USER_SWITCH_KEY); let allowSwitch = !this._lockdownSettings.get_boolean(DISABLE_USER_SWITCH_KEY);
this._loginScreenItem.actor.visible = allowSwitch && this._loginScreenItem.actor.visible = allowSwitch &&
@ -551,7 +556,7 @@ const UserMenuButton = new Lang.Class({
_updateLogout: function() { _updateLogout: function() {
let allowLogout = !this._lockdownSettings.get_boolean(DISABLE_LOG_OUT_KEY); let allowLogout = !this._lockdownSettings.get_boolean(DISABLE_LOG_OUT_KEY);
this._logoutItem.actor.visible = allowLogout; this._logoutItem.actor.visible = allowLogout && this._userManager.has_multiple_users;
}, },
_updateLockScreen: function() { _updateLockScreen: function() {