use setenv/unsetenv instead of putenv, cuz they are not ugly and confusing wrt memory leaks
This commit is contained in:
parent
9a93350aa7
commit
a4d13100e6
3 changed files with 10 additions and 4 deletions
|
@ -4,6 +4,10 @@
|
|||
#include "openbox/screen.h"
|
||||
#include "gettext.h"
|
||||
|
||||
#ifdef HAVE_STDLIB_H
|
||||
# include <stdlib.h>
|
||||
#endif
|
||||
|
||||
typedef struct {
|
||||
gchar *cmd;
|
||||
gboolean sn;
|
||||
|
|
|
@ -194,7 +194,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(ob_display)));
|
||||
setenv("DISPLAY", DisplayString(ob_display), TRUE);
|
||||
|
||||
/* create available cursors */
|
||||
cursors[OB_CURSOR_NONE] = None;
|
||||
|
@ -516,7 +516,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 */
|
||||
putenv(g_strdup("DESKTOP_STARTUP_ID"));
|
||||
unsetenv("DESKTOP_STARTUP_ID");
|
||||
}
|
||||
|
||||
static void parse_args(gint *argc, gchar **argv)
|
||||
|
|
|
@ -21,7 +21,9 @@
|
|||
#include "gettext.h"
|
||||
#include "event.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#ifdef HAVE_STDLIB_H
|
||||
# include <stdlib.h>
|
||||
#endif
|
||||
|
||||
#ifndef USE_LIBSN
|
||||
|
||||
|
@ -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);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue