From 407a340b2b02d39699d1126628b997e73c8a3ec2 Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Fri, 30 Aug 2013 13:40:40 +0200 Subject: [PATCH] EndSessionDialog: don't show other logged in users at log out We're not killing their session, so it's pointless to show them. https://bugzilla.gnome.org/show_bug.cgi?id=707124 --- js/ui/endSessionDialog.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js index 3e7f826ea..049fe5f31 100644 --- a/js/ui/endSessionDialog.js +++ b/js/ui/endSessionDialog.js @@ -73,7 +73,8 @@ const logoutDialogContent = { }, confirmButtons: [{ signal: 'ConfirmedLogout', label: C_("button", "Log Out") }], - iconStyleClass: 'end-session-dialog-logout-icon' + iconStyleClass: 'end-session-dialog-logout-icon', + showOtherSessions: false, }; const shutdownDialogContent = { @@ -88,7 +89,8 @@ const shutdownDialogContent = { { signal: 'ConfirmedShutdown', label: C_("button", "Power Off") }], iconName: 'system-shutdown-symbolic', - iconStyleClass: 'end-session-dialog-shutdown-icon' + iconStyleClass: 'end-session-dialog-shutdown-icon', + showOtherSessions: true, }; const restartDialogContent = { @@ -101,7 +103,8 @@ const restartDialogContent = { confirmButtons: [{ signal: 'ConfirmedReboot', label: C_("button", "Restart") }], iconName: 'view-refresh-symbolic', - iconStyleClass: 'end-session-dialog-shutdown-icon' + iconStyleClass: 'end-session-dialog-shutdown-icon', + showOtherSessions: true, }; const restartInstallDialogContent = { @@ -115,7 +118,8 @@ const restartInstallDialogContent = { confirmButtons: [{ signal: 'ConfirmedReboot', label: C_("button", "Restart & Install") }], iconName: 'view-refresh-symbolic', - iconStyleClass: 'end-session-dialog-shutdown-icon' + iconStyleClass: 'end-session-dialog-shutdown-icon', + showOtherSessions: true, }; const DialogContent = { @@ -553,7 +557,8 @@ const EndSessionDialog = new Lang.Class({ this._applications.push(inhibitor); } - this._loadSessions(); + if (DialogContent[type].showOtherSessions) + this._loadSessions(); this._updateButtons();