X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=3d4db6f95ba7c989ec7617ef28240187436991ad;hb=ee2368044dd077207962f71194158265c74fe74e;hp=cd95a5d6d206ccdc0c126091b3678a3d178ee1ef;hpb=d447dc0f59619d26073699d9f81d7de77c200be4;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index cd95a5d6..3d4db6f9 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"
@@ -148,29 +147,32 @@ int main(int argc, char **argv)
     extensions_query_all(); /* find which extensions are present */
 
     if (screen_annex()) { /* it will be ours! */
+        /* startup the parsing so everything can register sections of the rc */
+        parse_startup();
+
+        /* anything that is going to read data from the rc file needs to be 
+           in this group */
 	timer_startup();
-        config_startup();
 	render_startup();
 	font_startup();
+	event_startup();
+        grab_startup();
+        engine_startup();
+	focus_startup();
         plugin_startup();
-
-        /* startup the parsing so plugins can register sections of the rc */
-        parse_startup();
-
         /* load the plugins specified in the pluginrc */
         plugin_loadall();
+
         /* parse/load user options */
         parse_rc();
-
         /* we're done with parsing now, kill it */
         parse_shutdown();
 
-	engine_startup();
-	event_startup();
+        /* load the engine specified in the rc */
+	engine_load();
+
 	screen_startup();
-	focus_startup();
 	client_startup();
-        grab_startup();
 
         /* call startup for all the plugins */
         plugin_startall();
@@ -186,14 +188,13 @@ int main(int argc, char **argv)
 	client_unmanage_all();
 
         plugin_shutdown(); /* calls all the plugins' shutdown functions */
-        grab_shutdown();
 	client_shutdown();
-	focus_shutdown();
 	screen_shutdown();
-	event_shutdown();
+	focus_shutdown();
 	engine_shutdown();
+        grab_shutdown();
+	event_shutdown();
 	render_shutdown();
-        config_shutdown();
 	timer_shutdown();
     }