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
Dana Jansens danakj@orodu.net
3 files changed,
9 insertions(+),
6 deletions(-)
M
doc/openbox-gnome-session.1
→
doc/openbox-gnome-session.1
@@ -6,6 +6,9 @@ .SH "DESCRIPTION"
.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 @@ \fBhttp://openbox.org/\fP
.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
M
doc/openbox-kde-session.1
→
doc/openbox-kde-session.1
@@ -6,6 +6,9 @@ .SH "DESCRIPTION"
.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 @@ \fBhttp://openbox.org/\fP
.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
M
openbox/openbox.c
→
openbox/openbox.c
@@ -493,11 +493,8 @@ {
/* 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)