From: Mikael Magnusson Date: Mon, 3 Mar 2008 16:10:53 +0000 (+0100) Subject: Merge branch 'backport' into work X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=d78ae0546dae17eda6084a1bd33e63637ba802e5;p=chaz%2Fopenbox Merge branch 'backport' into work Conflicts: openbox/session.c --- d78ae0546dae17eda6084a1bd33e63637ba802e5 diff --cc openbox/session.c index 3cf8fbe2,ab6864b3..ca45adb9 --- a/openbox/session.c +++ b/openbox/session.c @@@ -408,10 -404,25 +408,25 @@@ static void sm_save_yourself(SmcConn co 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\n", vendor); + ob_debug_type(OB_DEBUG_SM, "Session manager's vendor: %s", vendor); if (!strcmp(vendor, "KDE")) { /* ksmserver guarantees that phase 1 will complete before allowing any