[Xfce4-commits] <xfce4-panel:xfce-4.10> Actions: Fix logic of session saving (bug #8857).

[Nick Schermer]

Updating branch refs/heads/xfce-4.10
         to 31f9236eff7a8221a811966e0d5201c1c8877757 (commit)
       from 6ef607c51d1a115e398ff5a13eb67a583d15faff (commit)

commit 31f9236eff7a8221a811966e0d5201c1c8877757
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Jul 22 11:43:51 2012 +0200

    Actions: Fix logic of session saving (bug #8857).
    
    (cherry picked from commit 17643fd28f499691ae97503eb58755b4b9fabb53)

 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: