X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fsession.c;h=811592ec90cd5fbbfb68531a36ebc5a88e4bf18b;hb=b6c501cb7cd148fb9beccadcdfc092d1f7d167a4;hp=82e292b38a14e3df6405dcb0d37271257f0a9893;hpb=04c6d45ac06966201740bad9db50cb4ccc5a04ef;p=chaz%2Fopenbox
diff --git a/openbox/session.c b/openbox/session.c
index 82e292b3..811592ec 100644
--- a/openbox/session.c
+++ b/openbox/session.c
@@ -397,14 +397,28 @@ static void sm_save_yourself_2(SmcConn conn, SmPointer data)
SmcSaveYourselfDone(conn, success);
}
-
static void sm_save_yourself(SmcConn conn, SmPointer data, gint save_type,
Bool shutdown, gint interact_style, Bool fast)
{
ObSMSaveData *savedata = NULL;
gchar *vendor;
- ob_debug_type(OB_DEBUG_SM, "Session save requested\n");
+#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);
@@ -472,10 +486,14 @@ static gboolean session_save_to_file(const ObSMSaveData *savedata)
if (screen_desktop_names) {
gint i;
+ gchar *t;
fprintf(f, "\n");
- for (i = 0; screen_desktop_names[i]; ++i)
- fprintf(f, " %s\n", screen_desktop_names[i]);
+ for (i = 0; screen_desktop_names[i]; ++i){
+ t = g_markup_escape_text(screen_desktop_names[i], -1);
+ fprintf(f, " %s\n", t);
+ g_free(t);
+ }
fprintf(f, "\n");
}
@@ -530,8 +548,11 @@ static gboolean session_save_to_file(const ObSMSaveData *savedata)
if (c->sm_client_id)
fprintf(f, "\n", c->sm_client_id);
- else
- fprintf(f, "\n", c->wm_command);
+ else {
+ t = g_markup_escape_text(c->wm_command, -1);
+ fprintf(f, "\n", t);
+ g_free(t);
+ }
t = g_markup_escape_text(c->name, -1);
fprintf(f, "\t%s\n", t);