From: Dana Jansens <danakj@orodu.net>
Date: Sun, 22 Jun 2003 08:29:40 +0000 (+0000)
Subject: reorder startup so menu goes before config parsing
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=197988af674da27837f7a9e930e7a6d5c7a48c60;p=chaz%2Fopenbox

reorder startup so menu goes before config parsing
---

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 70b65e40..e4aae9e8 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -194,12 +194,14 @@ int main(int argc, char **argv)
 	timer_startup();
 	event_startup();
         grab_startup();
+        window_startup();
         plugin_startup();
         /* load the plugins specified in the pluginrc */
         plugin_loadall();
 
         /* set up the kernel config shit */
         config_startup();
+        menu_startup();
         /* parse/load user options */
         if (parse_load_rc(&doc, &node))
             parse_tree(doc, node->xmlChildrenNode, NULL);
@@ -211,8 +213,6 @@ int main(int argc, char **argv)
         if (ob_rr_theme == NULL)
             exit_with_error("Unable to load a theme.");
 
-        window_startup();
-        menu_startup();
         frame_startup();
         moveresize_startup();
 	focus_startup();