forked from pool/xfce4-session
36 lines
929 B
Diff
36 lines
929 B
Diff
|
From 72f2c158740201b51365bdbb1965e28446e8c4af Mon Sep 17 00:00:00 2001
|
||
|
|
From: Krzysiek <krzysiek.bmkx@gmail.com>
|
||
|
|
Date: Wed, 02 Feb 2011 16:33:21 +0000
|
||
|
|
Subject: Fix --fast CLI option when used with another option (bug #7197).
|
||
|
|
|
||
|
|
---
|
||
|
|
diff --git a/xfce4-session-logout/main.c b/xfce4-session-logout/main.c
|
||
|
|
index d322995..2ea18f1 100644
|
||
|
|
--- a/xfce4-session-logout/main.c
|
||
|
|
+++ b/xfce4-session-logout/main.c
|
||
|
|
@@ -154,10 +154,6 @@ main (int argc, char **argv)
|
||
|
|
{
|
||
|
|
shutdown_type = XFSM_SHUTDOWN_HIBERNATE;
|
||
|
|
}
|
||
|
|
- else if (opt_fast)
|
||
|
|
- {
|
||
|
|
- allow_save = FALSE;
|
||
|
|
- }
|
||
|
|
else if (opt_version)
|
||
|
|
{
|
||
|
|
printf ("%s (Xfce %s)\n\n"
|
||
|
|
@@ -170,6 +166,11 @@ main (int argc, char **argv)
|
||
|
|
return EXIT_SUCCESS;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ if (opt_fast)
|
||
|
|
+ {
|
||
|
|
+ allow_save = FALSE;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
dbus_error_init (&derror);
|
||
|
|
dbus_conn = dbus_bus_get (DBUS_BUS_SESSION, &derror);
|
||
|
|
if (G_UNLIKELY (dbus_conn == NULL))
|
||
|
|
--
|
||
|
|
cgit v0.8.3.4
|