summaryrefslogtreecommitdiff
path: root/openbox/openbox.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2003-04-05 20:27:03 +0000
committerDana Jansens <danakj@orodu.net>2003-04-05 20:27:03 +0000
commitcbbf90a718ecc6836ef7a77b9040aebb9da348b8 (patch)
treea53bcdc993f850bc0500daaebd5b1bd0b7b50ee1 /openbox/openbox.c
parent88f8ebada97c4c82252badeb57b7e71a2940600b (diff)
change how rc parsing will work. a=b will be parsed in any [section] and given to a separate parsing callback. no more general config infrastructure needed/
Diffstat (limited to 'openbox/openbox.c')
-rw-r--r--openbox/openbox.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/openbox/openbox.c b/openbox/openbox.c
index e2a4de3f..90756097 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -7,7 +7,6 @@
#include "screen.h"
#include "focus.h"
#include "extensions.h"
-#include "config.h"
#include "parse.h"
#include "grab.h"
#include "engine.h"
@@ -149,11 +148,11 @@ int main(int argc, char **argv)
if (screen_annex()) { /* it will be ours! */
timer_startup();
- config_startup();
render_startup();
font_startup();
event_startup();
grab_startup();
+ engine_startup();
plugin_startup();
/* startup the parsing so plugins can register sections of the rc */
@@ -167,7 +166,9 @@ int main(int argc, char **argv)
/* we're done with parsing now, kill it */
parse_shutdown();
- engine_startup();
+ /* load the engine specified in the rc */
+ engine_load();
+
screen_startup();
focus_startup();
client_startup();
@@ -193,7 +194,6 @@ int main(int argc, char **argv)
grab_shutdown();
event_shutdown();
render_shutdown();
- config_shutdown();
timer_shutdown();
}