we don't need to save the config type in the session because if they dont run their...

[chaz/openbox] / openbox / session.c

diff --git a/openbox/session.c b/openbox/session.c
index 7a9a081d8072d0c8ece42c52ee31e46a78d12004..b07f16942418cbbbc56f2e71a9571d288a516d63 100644 (file)
--- a/openbox/session.c
+++ b/openbox/session.c
@@ -319,15 +319,12 @@ static void session_setup_clone_command()
 static void session_setup_restart_command()
 {
     gint i;
-    gint num = 4;
 
-    if (ob_config_type) num += 2;
-
-    SmPropValue *vals = g_new(SmPropValue, sm_argc + num);
+    SmPropValue *vals = g_new(SmPropValue, sm_argc + 4);
     SmProp prop = {
         .name = g_strdup(SmRestartCommand),
         .type = g_strdup(SmLISTofARRAY8),
-        .num_vals = sm_argc + num,
+        .num_vals = sm_argc + 4,
         .vals = vals
     };
     SmProp *list = ∝
@@ -353,22 +350,11 @@ static void session_setup_restart_command()
     ob_debug_type(OB_DEBUG_SM, "    %s\n", vals[i+2].value);
     ob_debug_type(OB_DEBUG_SM, "    %s\n", vals[i+3].value);
 
-    if (ob_config_type) {
-        vals[i+4].value = g_strdup("--config-namespace");
-        vals[i+4].length = strlen("--config-namespace") + 1;
-        vals[i+5].value = ob_config_type;
-        vals[i+5].length = strlen(ob_config_type) + 1;
-        ob_debug_type(OB_DEBUG_SM, "    %s\n", vals[i+4].value);
-        ob_debug_type(OB_DEBUG_SM, "    %s\n", vals[i+5].value);
-    }
-
     SmcSetProperties(sm_conn, 1, &list);
     g_free(prop.name);
     g_free(prop.type);
     g_free(vals[i].value);
     g_free(vals[i+2].value);
-    if (ob_config_type)
-        g_free(vals[i+4].value);
     g_free(vals);
 }