X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=9ec47bc09d2b86ade7a646d8b06dd6ba3656bc71;hb=20b8fcfa33feeade5946bc7f3046705da5d164fe;hp=6a58cca6e5b667825dfd43c51fc25ef0aa5930f7;hpb=dc94a241c30484611688a8bfb5515577f017529e;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 6a58cca6..9ec47bc0 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -33,6 +33,7 @@
 #include "focus_cycle_popup.h"
 #include "moveresize.h"
 #include "frame.h"
+#include "framerender.h"
 #include "keyboard.h"
 #include "mouse.h"
 #include "menuframe.h"
@@ -177,7 +178,7 @@ gint main(gint argc, gchar **argv)
 
     /* set the DISPLAY environment variable for any lauched children, to the
        display we're using, so they open in the right place. */
-    putenv(g_strdup_printf("DISPLAY=%s", DisplayString(obt_display)));
+    setenv("DISPLAY", DisplayString(obt_display), TRUE);
 
     /* create available cursors */
     cursors[OB_CURSOR_NONE] = None;
@@ -490,9 +491,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);
+    unsetenv("DESKTOP_STARTUP_ID");
 }
 
 static void parse_args(gint *argc, gchar **argv)