[Xfce4-commits] <xfce4-panel:master> Actions: Fix logic of session saving (bug #8857).
Nick Schermer
noreply at xfce.org
Sun Jul 22 11:46:01 CEST 2012
Updating branch refs/heads/master
to 17643fd28f499691ae97503eb58755b4b9fabb53 (commit)
from eae14b0fc9587bb2064efd59170a602844f1cd15 (commit)
commit 17643fd28f499691ae97503eb58755b4b9fabb53
Author: Nick Schermer <nick at xfce.org>
Date: Sun Jul 22 11:43:51 2012 +0200
Actions: Fix logic of session saving (bug #8857).
plugins/actions/actions.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/plugins/actions/actions.c b/plugins/actions/actions.c
index ebc7b5b..53ff8d0 100644
--- a/plugins/actions/actions.c
+++ b/plugins/actions/actions.c
@@ -705,7 +705,7 @@ actions_plugin_action_confirmation_time (gpointer data)
if (timeout->time_left == 0)
{
- /* unattended shutdown, so don't allow apps to cancel shutdown */
+ /* unattended shutdown, don't save the session to avoid blocking the logout */
timeout->unattended = TRUE;
gtk_dialog_response (GTK_DIALOG (timeout->dialog),
@@ -928,22 +928,22 @@ actions_plugin_action_activate (GtkWidget *widget,
{
case ACTION_TYPE_LOGOUT:
succeed = actions_plugin_action_dbus_xfsm ("Logout", FALSE,
- unattended, &error);
+ !unattended, &error);
break;
case ACTION_TYPE_LOGOUT_DIALOG:
succeed = actions_plugin_action_dbus_xfsm ("Logout", TRUE,
- unattended, &error);
+ !unattended, &error);
break;
case ACTION_TYPE_RESTART:
succeed = actions_plugin_action_dbus_xfsm ("Restart", FALSE,
- unattended, &error);
+ !unattended, &error);
break;
case ACTION_TYPE_SHUTDOWN:
succeed = actions_plugin_action_dbus_xfsm ("Shutdown", FALSE,
- unattended, &error);
+ !unattended, &error);
break;
case ACTION_TYPE_HIBERNATE:
More information about the Xfce4-commits
mailing list