don't unset the config namespace so that if you rerun it, it uses the same one. this...

also, recompiled man pages

diff --git a/doc/openbox-gnome-session.1 b/doc/openbox-gnome-session.1
index b5f775e4c715240bfd6e4df002f15899cb247205..1aca9a2546c8af4a136e3a2d3a2a65513afa7284 100644 (file)
--- a/doc/openbox-gnome-session.1
+++ b/doc/openbox-gnome-session.1
@@ -6,6 +6,9 @@ openbox-gnome-session \(em Run a GNOME session with Openbox as the window manage
 .PP 
 \fBopenbox-gnome-session\fR runs a GNOME session with 
 Openbox as the window manager. 
+.PP 
+When running inside GNOME like this, Openbox will use the 
+\fBrc-gnome.xml\fP configuration file. 
 .SH "SEE ALSO" 
 .PP 
 openbox(1), openbox-kde-session (1). 
@@ -16,4 +19,4 @@ The program's full documentation is available on the website:
 .PP 
 Please report bugs to: \fBhttp://bugzilla.icculus.org/ 
 \fP 
-.\" created by instant / docbook-to-man, Sun 13 May 2007, 18:05 
+.\" created by instant / docbook-to-man, Sun 13 May 2007, 19:01 

diff --git a/doc/openbox-kde-session.1 b/doc/openbox-kde-session.1
index 45d5c21b8208050d527c65e2236a547f1b45f5ef..b76c1bdc877c03ab4e4b086598f8e08034d1e524 100644 (file)
--- a/doc/openbox-kde-session.1
+++ b/doc/openbox-kde-session.1
@@ -6,6 +6,9 @@ openbox-kde-session \(em Run a KDE session with Openbox as the window manager
 .PP 
 \fBopenbox-kde-session\fR runs a KDE session with 
 Openbox as the window manager. 
+.PP 
+When running inside KDE like this, Openbox will use the 
+\fBrc-kde.xml\fP configuration file. 
 .SH "SEE ALSO" 
 .PP 
 openbox(1), openbox-gnome-session (1). 
@@ -16,4 +19,4 @@ The program's full documentation is available on the website:
 .PP 
 Please report bugs to: \fBhttp://bugzilla.icculus.org/ 
 \fP 
-.\" created by instant / docbook-to-man, Sun 13 May 2007, 18:05 
+.\" created by instant / docbook-to-man, Sun 13 May 2007, 19:01 

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 0006f438bc3c2957ddeff4f123b787dd693f458c..0f2ba9237cf150c7619f781feb99dd0d26688ae2 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -493,11 +493,8 @@ static void parse_env()
     /* unset this so we don't pass it on unknowingly */
     unsetenv("DESKTOP_STARTUP_ID");
 
-    if (getenv("OPENBOX_CONFIG_NAMESPACE")) {
+    if (getenv("OPENBOX_CONFIG_NAMESPACE"))
         ob_config_type = g_strdup(getenv("OPENBOX_CONFIG_NAMESPACE"));
-        /* don't pass it on except if we restart */
-        unsetenv("OPENBOX_CONFIG_NAMESPACE");
-    }
 }
 
 static void parse_args(gint *argc, gchar **argv)