Reuse ObFocusCyclePopupTargets when refreshing the focus cycle dialog

[chaz/openbox] / openbox / startupnotify.c

diff --git a/openbox/startupnotify.c b/openbox/startupnotify.c
index e9bb8310a0433989bac5254a8bbc07073a3e944d..47c95da12b5afd66b02172a567a5cade2dc57d1d 100644 (file)
--- a/openbox/startupnotify.c
+++ b/openbox/startupnotify.c
@@ -21,7 +21,9 @@
 #include "gettext.h"
 #include "event.h"
 
-#include <stdlib.h>
+#ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+#endif
 
 #ifndef USE_LIBSN
 
@@ -238,7 +240,7 @@ void sn_setup_spawn_environment(const gchar *program, const gchar *name,
     gchar *desc;
     const char *id;
 
-    desc = g_strdup_printf(_("Running %s\n"), program);
+    desc = g_strdup_printf(_("Running %s"), program);
 
     if (sn_launcher_context_get_initiated(sn_launcher)) {
         sn_launcher_context_unref(sn_launcher);
@@ -264,7 +266,7 @@ void sn_setup_spawn_environment(const gchar *program, const gchar *name,
                              g_direct_equal,
                              (GDestroyNotify)sn_launcher_context_unref);
 
-    putenv(g_strdup_printf("DESKTOP_STARTUP_ID=%s", id));
+    setenv("DESKTOP_STARTUP_ID", id, TRUE);
 
     g_free(desc);
 }