strip leading/trailing whitespace off stuff when reading it from the configs

[chaz/openbox] / openbox / session.c

diff --git a/openbox/session.c b/openbox/session.c
index ea909897f3a41adec17d8cf6a7114cbdb64d9344..d1a3f99bf3f0237d4d7c5f1306f1c9dabcc59df3 100644 (file)
--- a/openbox/session.c
+++ b/openbox/session.c
@@ -401,7 +401,6 @@ 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)
 {
@@ -414,7 +413,7 @@ static void sm_save_yourself(SmcConn conn, SmPointer data, gint save_type,
             (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);
+        ob_debug_type(OB_DEBUG_SM, "Session save requested, type %s", sname);
     }
 #endif
 
@@ -491,10 +490,14 @@ static gboolean session_save_to_file(const ObSMSaveData *savedata)
 
         if (screen_desktop_names) {
             gint i;
+            gchar *t;
 
             fprintf(f, "<desktopnames>\n");
-            for (i = 0; screen_desktop_names[i]; ++i)
-                fprintf(f, "  <name>%s</name>\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, "  <name>%s</name>\n", t);
+                g_free(t);
+            }
             fprintf(f, "</desktopnames>\n");
         }
 
@@ -549,8 +552,11 @@ static gboolean session_save_to_file(const ObSMSaveData *savedata)
 
             if (c->sm_client_id)
                 fprintf(f, "<window id=\"%s\">\n", c->sm_client_id);
-            else
-                fprintf(f, "<window command=\"%s\">\n", c->wm_command);
+            else {
+                t = g_markup_escape_text(c->wm_command, -1);
+                fprintf(f, "<window command=\"%s\">\n", t);
+                g_free(t);
+            }
 
             t = g_markup_escape_text(c->name, -1);
             fprintf(f, "\t<name>%s</name>\n", t);