only unset the startup_desktop_id once, and dont free the string we pass to putenv

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 48f31f9140f5c2b3ab0749100f302e2ed5421fc9..0c74b255bae8fdef00a64f4b54c8bacf975b064c 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -515,9 +515,7 @@ static void remove_args(gint *argc, gchar **argv, gint index, gint num)
 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)

diff --git a/openbox/startupnotify.c b/openbox/startupnotify.c
index 8bc38da2c7d59a8712bbfcb81e92f02dbe787641..78a1e94afd63e03e0f6b5859a4d49ba4d5d96751 100644 (file)
--- a/openbox/startupnotify.c
+++ b/openbox/startupnotify.c
@@ -58,15 +58,8 @@ 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,
                                         sn_event_func, NULL, NULL);