diff --git a/data/rc-gnome.xml b/data/rc-gnome.xml deleted file mode 100644 index 20b20c51..00000000 --- a/data/rc-gnome.xml +++ /dev/null @@ -1,546 +0,0 @@ - - - - - - - - 10 - 20 - - - - yes - yes - no - 200 - no - - - - Smart - - - - - Clearlooks - NLIMC - yes - - yes - yes - - sans - 8 - - bold - - normal - - - - sans - 8 - - bold - - normal - - - - sans - 9 - - normal - - normal - - - - sans - 9 - - normal - - normal - - - - sans - 9 - - bold - - normal - - - - - - - 4 - 1 - - desktop one - desktop two - desktop three - desktop four - - - - - yes - Nonpixel - - Center - - - - - TopLeft - - 0 - 0 - no - Above - - Vertical - - no - 300 - - 300 - - Middle - - - - - C-g - - - - no - - - no - - - no - - - no - - - no - - - no - - - no - - - no - - - 1 - - - 1 - - - 1 - - - 1 - - - - - - - - - - - - - - - - client-menu - - - - - - - - - - - - yesyes - - - - - - - - true - Konqueror - - kfmclient openProfile filemanagement - - - - - - 3 - - 200 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - client-menu - - - - - - - - - top - - - - - - - - - bottom - - - - - - - - - - - client-menu - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - client-menu - - - - client-menu - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - menu.xml - 200 - no - 100 - yes - - - - - - - - - - yes - - no - - - - center - - 200 - - 1 - - - - yes - - - 1 - - - normal - - - no - - no - - - no - - - yes - - true - - - - --> - - diff --git a/data/rc-kde.xml b/data/rc-kde.xml deleted file mode 100644 index 20b20c51..00000000 --- a/data/rc-kde.xml +++ /dev/null @@ -1,546 +0,0 @@ - - - - - - - - 10 - 20 - - - - yes - yes - no - 200 - no - - - - Smart - - - - - Clearlooks - NLIMC - yes - - yes - yes - - sans - 8 - - bold - - normal - - - - sans - 8 - - bold - - normal - - - - sans - 9 - - normal - - normal - - - - sans - 9 - - normal - - normal - - - - sans - 9 - - bold - - normal - - - - - - - 4 - 1 - - desktop one - desktop two - desktop three - desktop four - - - - - yes - Nonpixel - - Center - - - - - TopLeft - - 0 - 0 - no - Above - - Vertical - - no - 300 - - 300 - - Middle - - - - - C-g - - - - no - - - no - - - no - - - no - - - no - - - no - - - no - - - no - - - 1 - - - 1 - - - 1 - - - 1 - - - - - - - - - - - - - - - - client-menu - - - - - - - - - - - - yesyes - - - - - - - - true - Konqueror - - kfmclient openProfile filemanagement - - - - - - 3 - - 200 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - client-menu - - - - - - - - - top - - - - - - - - - bottom - - - - - - - - - - - client-menu - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - client-menu - - - - client-menu - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - menu.xml - 200 - no - 100 - yes - - - - - - - - - - yes - - no - - - - center - - 200 - - 1 - - - - yes - - - 1 - - - normal - - - no - - no - - - no - - - yes - - true - - - - --> - - diff --git a/data/xsession/openbox-gnome-session.in b/data/xsession/openbox-gnome-session.in index b5223552..c2bc9399 100644 --- a/data/xsession/openbox-gnome-session.in +++ b/data/xsession/openbox-gnome-session.in @@ -2,5 +2,4 @@ # Run GNOME with Openbox as its window manager export WINDOW_MANAGER="@bindir@/openbox" -export OPENBOX_CONFIG_NAMESPACE="gnome" exec gnome-session "$@" diff --git a/data/xsession/openbox-kde-session.in b/data/xsession/openbox-kde-session.in index a125e4cd..0fe00940 100644 --- a/data/xsession/openbox-kde-session.in +++ b/data/xsession/openbox-kde-session.in @@ -2,5 +2,4 @@ # Run KDE with Openbox as its window manager export KDEWM="@bindir@/openbox" -export OPENBOX_CONFIG_NAMESPACE="kde" exec startkde "$@" diff --git a/doc/openbox.1.sgml b/doc/openbox.1.sgml index b1736554..1cce5545 100644 --- a/doc/openbox.1.sgml +++ b/doc/openbox.1.sgml @@ -85,17 +85,9 @@ manpage.1: manpage.sgml for you. The default configuration files are installed in - @configdir@/openbox/, and the user configuration is placed in - ~/.config/openbox/. You can copy the default configuration + @configdir@/openbox/rc.xml, and the user configuration is placed in + ~/.config/openbox/rc.xml. You can copy the default configuration to ~/.config/openbox and edit it to your liking. - - There are 3 default configuration files, rc.xml, - rc-gnome.xml, and rc-kde.xml. The - rc-gnome.xml is used when you run - openbox-gnome-session and the rc-kde.xml is used when - you run openbox-kde-session. The configuration - files should be named the same in ~/.config/openbox/. - OPTIONS diff --git a/openbox/openbox.c b/openbox/openbox.c index 303f809b..ee3911d9 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -101,7 +101,6 @@ static KeyCode keys[OB_NUM_KEYS]; static gint exitcode = 0; static guint remote_control = 0; static gboolean being_replaced = FALSE; -static gchar *config_type = NULL; static void signal_handler(gint signal, gpointer data); static void remove_args(gint *argc, gchar **argv, gint index, gint num); @@ -238,15 +237,17 @@ gint main(gint argc, gchar **argv) config_startup(i); /* parse/load user options */ - if (parse_load_rc(config_type, &doc, &node)) { + if (parse_load_rc(NULL, &doc, &node)) { parse_tree(i, doc, node->xmlChildrenNode); parse_close(doc); } else g_message(_("Unable to find a valid config file, using some simple defaults")); +/* if (config_type != NULL) PROP_SETS(RootWindow(ob_display, ob_screen), ob_config, config_type); +*/ /* we're done with parsing now, kill it */ parse_shutdown(i); @@ -489,8 +490,6 @@ static void parse_env() { /* unset this so we don't pass it on unknowingly */ unsetenv("DESKTOP_STARTUP_ID"); - - config_type = getenv("OPENBOX_CONFIG_NAMESPACE"); } static void parse_args(gint *argc, gchar **argv)