aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Trevisan (Treviño) <mail@3v1n0.net>2013-03-06 13:42:02 +0100
committerMarco Trevisan (Treviño) <mail@3v1n0.net>2013-03-06 13:42:02 +0100
commita169fe5c78143eb91864c6cee3d9e537834c7c39 (patch)
tree32b262cc9421995bf789e2b1a9e602e36f1dc5d6
parent7f059f4a2cc87e3145332d2431220f2389271e4d (diff)
downloadayatana-indicator-session-a169fe5c78143eb91864c6cee3d9e537834c7c39.tar.gz
ayatana-indicator-session-a169fe5c78143eb91864c6cee3d9e537834c7c39.tar.bz2
ayatana-indicator-session-a169fe5c78143eb91864c6cee3d9e537834c7c39.zip
SessionMenuMgr: call Shutdown method if we're suppressing the dialogs
-rw-r--r--src/session-menu-mgr.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/session-menu-mgr.c b/src/session-menu-mgr.c
index 9010f36..ba82645 100644
--- a/src/session-menu-mgr.c
+++ b/src/session-menu-mgr.c
@@ -1210,10 +1210,17 @@ action_func_shutdown (SessionMenuMgr * mgr)
{
if (mgr->shell_mode)
{
- /* We call 'Reboot' method instead of 'Shutdown' because
- * Unity SessionManager handles the Shutdown request as a more
- * general request as the default SessionManager dialog would do */
- call_session_manager_method ("Reboot", NULL);
+ if (g_settings_get_boolean (mgr->indicator_settings, "suppress-logout-restart-shutdown"))
+ {
+ call_session_manager_method ("Shutdown", NULL);
+ }
+ else
+ {
+ /* We call 'Reboot' method instead of 'Shutdown' because
+ * Unity SessionManager handles the Shutdown request as a more
+ * general request as the default SessionManager dialog would do */
+ call_session_manager_method ("Reboot", NULL);
+ }
}
else
{