don't unset the config namespace so that if you rerun it, it uses the same one. this is for dev work, really.

also, recompiled man pages
This commit is contained in:
Dana Jansens 2007-05-13 23:01:04 +00:00
parent d8d4f5ba90
commit 334f9df7aa
3 changed files with 9 additions and 6 deletions

View file

@ -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

View file

@ -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

View file

@ -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)