summaryrefslogtreecommitdiff
path: root/openbox/openbox.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2003-03-22 22:45:05 +0000
committerDana Jansens <danakj@orodu.net>2003-03-22 22:45:05 +0000
commit9f68b12062bfa5e68c00db8a74ca58998661a13b (patch)
tree189a887bdcb4cc424be4176a87c5086b02cdab99 /openbox/openbox.c
parent93783c2a048574ffc99d329aae3f6ff50e31d8d7 (diff)
load the engine out of the config shit. tho the ordering is fucked atm
Diffstat (limited to 'openbox/openbox.c')
-rw-r--r--openbox/openbox.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/openbox/openbox.c b/openbox/openbox.c
index 4bc12bcd..b32977b1 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -148,7 +148,7 @@ int main(int argc, char **argv)
render_startup();
font_startup();
themerc_startup();
- engine_startup(themerc_engine);
+ engine_startup();
event_startup();
screen_startup();
focus_startup();
@@ -156,8 +156,6 @@ int main(int argc, char **argv)
grab_startup();
plugin_startup();
- config_parse();
-
/* XXX load all plugins!! */
plugin_open("focus");
plugin_open("keyboard");
@@ -165,6 +163,8 @@ int main(int argc, char **argv)
plugin_open("placement");
plugin_open("resistance");
+ config_parse();
+
/* get all the existing windows */
client_manage_all();