nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

setenv and unsetenv dont exist in Solaris 9. (Fixes bug #4663)

Browse source 
Seeing as how you already use glib, I just substituted g_setenv and g_unsetenv
as appropriate, and it now works for me.
This commit is contained in:
Philip Brown 2010-10-16 16:16:51 -04:00 committed by Dana Jansens
parent 9c356d370a
commit d082572b17
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
openbox/actions/execute.c
View file

@ -260,7 +260,7 @@ static gboolean run_func(ObActionsData *data, gpointer options)
if (o->sn) {
if (!ok) sn_spawn_cancel();
unsetenv("DESKTOP_STARTUP_ID");
g_unsetenv("DESKTOP_STARTUP_ID");
}
g_free(program);

6
openbox/openbox.c
View file

@ -196,7 +196,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. */
setenv("DISPLAY", DisplayString(obt_display), TRUE);
g_setenv("DISPLAY", DisplayString(obt_display), TRUE);
/* create available cursors */
cursors[OB_CURSOR_NONE] = None;
@ -589,12 +589,12 @@ static void parse_env(void)
const gchar *id;
/* unset this so we don't pass it on unknowingly */
unsetenv("DESKTOP_STARTUP_ID");
g_unsetenv("DESKTOP_STARTUP_ID");
/* this is how gnome-session passes in a session client id */
id = g_getenv("DESKTOP_AUTOSTART_ID");
if (id) {
unsetenv("DESKTOP_AUTOSTART_ID");
g_unsetenv("DESKTOP_AUTOSTART_ID");
if (ob_sm_id) g_free(ob_sm_id);
ob_sm_id = g_strdup(id);
ob_debug_type(OB_DEBUG_SM,

2
openbox/startupnotify.c
View file

@ -263,7 +263,7 @@ void sn_setup_spawn_environment(const gchar *program, const gchar *name,
20 * 1000, sn_launch_wait_timeout, sn_launcher,
(GDestroyNotify)sn_launcher_context_unref);
setenv("DESKTOP_STARTUP_ID", id, TRUE);
g_setenv("DESKTOP_STARTUP_ID", id, TRUE);
g_free(desc);
}