[Xfce4-commits] <xfce4-session:master> Fix logic of the --fast action (bug #8857).

[Nick Schermer]

Updating branch refs/heads/master
         to 499a719019e03da90b6901bb0f8a89d06ae167ee (commit)
       from 6924c3a28cb600706ec8ee781ee1b2d4f0525249 (commit)

commit 499a719019e03da90b6901bb0f8a89d06ae167ee
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Jul 22 11:44:49 2012 +0200

    Fix logic of the --fast action (bug #8857).

 xfce4-session-logout/main.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/xfce4-session-logout/main.c b/xfce4-session-logout/main.c
index 5af54c6..19a5c9a 100644
--- a/xfce4-session-logout/main.c
+++ b/xfce4-session-logout/main.c
@@ -48,7 +48,7 @@ gboolean opt_halt = FALSE;
 gboolean opt_reboot = FALSE;
 gboolean opt_suspend = FALSE;
 gboolean opt_hibernate = FALSE;
-gboolean allow_save = FALSE;
+gboolean opt_fast = FALSE;
 gboolean opt_version = FALSE;
 
 enum
@@ -83,7 +83,7 @@ static GOptionEntry option_entries[] =
     N_("Hibernate without displaying the logout dialog"),
     NULL
   },
-  { "fast", 'f', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &allow_save,
+  { "fast", 'f', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &opt_fast,
     N_("Log out quickly; don't save the session"),
     NULL
   },
@@ -123,6 +123,7 @@ main (int argc, char **argv)
   gboolean         show_dialog;
   gboolean         result = FALSE;
   guint            shutdown_type;
+  gboolean         allow_save;
 
   xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
 
@@ -149,6 +150,9 @@ main (int argc, char **argv)
       return EXIT_FAILURE;
     }
 
+  /* save the session, unless fast is provided */
+  allow_save = !opt_fast;
+
   /* create messsage */
   proxy = dbus_g_proxy_new_for_name_owner (conn,
                                            "org.xfce.SessionManager",