From 71badb0790c8595a0ab6dedfbf8027c698369210 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Tue, 8 Apr 2003 07:31:26 +0000
Subject: move config option loading for the kernel into config.c/h add options
 for the number of desktops and the names of the desktops

---
 openbox/openbox.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'openbox/openbox.c')

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 74f8164c..c4784aff 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -13,6 +13,7 @@
 #include "plugin.h"
 #include "timer.h"
 #include "group.h"
+#include "config.h"
 #include "gettext.h"
 #include "../render/render.h"
 #include "../render/font.h"
@@ -159,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 */
@@ -172,6 +174,7 @@ int main(int argc, char **argv)
         /* load the engine specified in the rc */
 	engine_load();
 
+	focus_startup();
 	screen_startup();
         group_startup();
 	client_startup();
@@ -199,6 +202,7 @@ int main(int argc, char **argv)
 	event_shutdown();
 	render_shutdown();
 	timer_shutdown();
+        config_shutdown();
     }
 
     dispatch_shutdown();
-- 
cgit v1.2.3