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

Seeing as how you already use glib, I just substituted g_setenv and g_unsetenv
as appropriate, and it now works for me.

diff --git a/openbox/actions/execute.c b/openbox/actions/execute.c
index fdce77b7c1c3cbbd647e36f49ce2a7ee21264b7f..380ffa008996936d4484d3d6bb15914cf861417c 100644 (file)
--- a/openbox/actions/execute.c
+++ b/openbox/actions/execute.c
@@ -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);

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 9fd5fe40b451a188249ba6ca6af7416b2321e1df..d5ed2b8273ddb5e501498ef801b3ce418fabfa5c 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -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,

diff --git a/openbox/startupnotify.c b/openbox/startupnotify.c
index 16654cfd13f4566ae068eaae126444e01099445b..e249002b106bd4299b1eb60227b7e0de54331e39 100644 (file)
--- a/openbox/startupnotify.c
+++ b/openbox/startupnotify.c
@@ -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);
 }