reorder startup so menu goes before config parsing

This commit is contained in:
Dana Jansens 2003-06-22 08:29:40 +00:00
parent 17a85c1cbd
commit 197988af67

View file

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