X-Git-Url: http://git.openbox.org/?p=mikachu%2Fopenbox.git;a=blobdiff_plain;f=openbox%2Fsession.c;fp=openbox%2Fsession.c;h=ca45adb934e9b670e6b68b98f427e2fe6d9498d1;hp=3cf8fbe246171f6eb720722f599202150db8489d;hb=d78ae0546dae17eda6084a1bd33e63637ba802e5;hpb=4b5373f609e6462995a38cc4f0f50b17cbc8f835

diff --git a/openbox/session.c b/openbox/session.c
index 3cf8fbe..ca45adb 100644
--- a/openbox/session.c
+++ b/openbox/session.c
@@ -408,7 +408,22 @@ static void sm_save_yourself(SmcConn conn, SmPointer data, gint save_type,
     ObSMSaveData *savedata = NULL;
     gchar *vendor;
 
-    ob_debug_type(OB_DEBUG_SM, "Session save requested");
+#ifdef DEBUG
+    {
+        const gchar *sname =
+            (save_type == SmSaveLocal ? "SmSaveLocal" :
+             (save_type == SmSaveGlobal ? "SmSaveGlobal" :
+              (save_type == SmSaveBoth ? "SmSaveBoth" : "INVALID!!")));
+        ob_debug_type(OB_DEBUG_SM, "Session save requested, type %s\n", sname);
+    }
+#endif
+
+    if (save_type == SmSaveGlobal) {
+        /* we have no data to save.  we only store state to get back to where
+           we were, we don't keep open writable files or anything */
+        SmcSaveYourselfDone(conn, TRUE);
+        return;
+    }
 
     vendor = SmcVendor(sm_conn);
     ob_debug_type(OB_DEBUG_SM, "Session manager's vendor: %s", vendor);
@@ -818,7 +833,7 @@ void session_request_logout(gboolean silent)
 {
     if (sm_conn) {
         SmcRequestSaveYourself(sm_conn,
-                               SmSaveBoth,
+                               SmSaveGlobal,
                                TRUE, /* logout */
                                (silent ?
                                 SmInteractStyleNone : SmInteractStyleAny),