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

EndSessionDialog: don't show other logged in users at log out

Browse Source 
We're not killing their session, so it's pointless to show them.

https://bugzilla.gnome.org/show_bug.cgi?id=707124
This commit is contained in:
Giovanni Campagna 2013-08-30 13:40:40 +02:00
parent 532346ecfb
commit 407a340b2b
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/ui/endSessionDialog.js
View File

@ -73,7 +73,8 @@ const logoutDialogContent = {
}, },
confirmButtons: [{ signal: 'ConfirmedLogout', confirmButtons: [{ signal: 'ConfirmedLogout',
label: C_("button", "Log Out") }], label: C_("button", "Log Out") }],
iconStyleClass: 'end-session-dialog-logout-icon' iconStyleClass: 'end-session-dialog-logout-icon',
showOtherSessions: false,
}; };
const shutdownDialogContent = { const shutdownDialogContent = {
@ -88,7 +89,8 @@ const shutdownDialogContent = {
{ signal: 'ConfirmedShutdown', { signal: 'ConfirmedShutdown',
label: C_("button", "Power Off") }], label: C_("button", "Power Off") }],
iconName: 'system-shutdown-symbolic', iconName: 'system-shutdown-symbolic',
iconStyleClass: 'end-session-dialog-shutdown-icon' iconStyleClass: 'end-session-dialog-shutdown-icon',
showOtherSessions: true,
}; };
const restartDialogContent = { const restartDialogContent = {
@ -101,7 +103,8 @@ const restartDialogContent = {
confirmButtons: [{ signal: 'ConfirmedReboot', confirmButtons: [{ signal: 'ConfirmedReboot',
label: C_("button", "Restart") }], label: C_("button", "Restart") }],
iconName: 'view-refresh-symbolic', iconName: 'view-refresh-symbolic',
iconStyleClass: 'end-session-dialog-shutdown-icon' iconStyleClass: 'end-session-dialog-shutdown-icon',
showOtherSessions: true,
}; };
const restartInstallDialogContent = { const restartInstallDialogContent = {
@ -115,7 +118,8 @@ const restartInstallDialogContent = {
confirmButtons: [{ signal: 'ConfirmedReboot', confirmButtons: [{ signal: 'ConfirmedReboot',
label: C_("button", "Restart & Install") }], label: C_("button", "Restart & Install") }],
iconName: 'view-refresh-symbolic', iconName: 'view-refresh-symbolic',
iconStyleClass: 'end-session-dialog-shutdown-icon' iconStyleClass: 'end-session-dialog-shutdown-icon',
showOtherSessions: true,
}; };
const DialogContent = { const DialogContent = {
@ -553,6 +557,7 @@ const EndSessionDialog = new Lang.Class({
this._applications.push(inhibitor); this._applications.push(inhibitor);
} }
if (DialogContent[type].showOtherSessions)
this._loadSessions(); this._loadSessions();
this._updateButtons(); this._updateButtons();