M openbox/openbox.c → openbox/openbox.c

@@ -515,9 +515,7 @@ 
 static void parse_env()
 {
     /* unset this so we don't pass it on unknowingly */
-    gchar *s = g_strdup("DESKTOP_STARTUP_ID");
-    putenv(s);
-    g_free(s);
+    putenv(g_strdup("DESKTOP_STARTUP_ID"));
 }
 
 static void parse_args(gint *argc, gchar **argv)

M openbox/startupnotify.c → openbox/startupnotify.c

@@ -58,14 +58,7 @@ static void sn_event_func(SnMonitorEvent *event, gpointer data);
 
 void sn_startup(gboolean reconfig)
 {
-    gchar *s;
-
     if (reconfig) return;
-
-    /* unset this so we don't pass it on unknowingly */
-    s = g_strdup("DESKTOP_STARTUP_ID");
-    putenv(s);
-    g_free(s);
 
     sn_display = sn_display_new(ob_display, NULL, NULL);
     sn_context = sn_monitor_context_new(sn_display, ob_screen,