diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-05-13 23:01:04 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2007-05-13 23:01:04 +0000 |
| commit | 334f9df7aadd4a136dc9411df1cb24a9eba6b6c8 (patch) | |
| tree | 0c5365885fc6bd74c0085c2e615c298b069df860 | |
| parent | d8d4f5ba9065d25eceb5b9813553ee0cdab58a6c (diff) | |
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
| -rw-r--r-- | doc/openbox-gnome-session.1 | 5 | ||||
| -rw-r--r-- | doc/openbox-kde-session.1 | 5 | ||||
| -rw-r--r-- | openbox/openbox.c | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/doc/openbox-gnome-session.1 b/doc/openbox-gnome-session.1 index b5f775e4..1aca9a25 100644 --- 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 45d5c21b..b76c1bdc 100644 --- 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 0006f438..0f2ba923 100644 --- 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) |