move config option loading for the kernel into config.c/h

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 3d4db6f95ba7c989ec7617ef28240187436991ad..c4784aff5ef96dab4a887c173998e51fbf5cffa3 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -12,6 +12,8 @@
 #include "engine.h"
 #include "plugin.h"
 #include "timer.h"
+#include "group.h"
+#include "config.h"
 #include "gettext.h"
 #include "../render/render.h"
 #include "../render/font.h"
@@ -158,11 +160,12 @@ int main(int argc, char **argv)
        event_startup();
         grab_startup();
         engine_startup();
-       focus_startup();
         plugin_startup();
         /* load the plugins specified in the pluginrc */
         plugin_loadall();
 
+        /* set up the kernel config shit */
+        config_startup();
         /* parse/load user options */
         parse_rc();
         /* we're done with parsing now, kill it */
@@ -171,7 +174,9 @@ int main(int argc, char **argv)
         /* load the engine specified in the rc */
        engine_load();
 
+       focus_startup();
        screen_startup();
+        group_startup();
        client_startup();
 
         /* call startup for all the plugins */
@@ -189,6 +194,7 @@ int main(int argc, char **argv)
 
         plugin_shutdown(); /* calls all the plugins' shutdown functions */
        client_shutdown();
+        group_shutdown();
        screen_shutdown();
        focus_shutdown();
        engine_shutdown();
@@ -196,6 +202,7 @@ int main(int argc, char **argv)
        event_shutdown();
        render_shutdown();
        timer_shutdown();
+        config_shutdown();
     }
 
     dispatch_shutdown();