X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=250ca6d07f465753515259a96698131618574f1c;hb=04b570de01abc9661f9cf30dba306e66307957f3;hp=db14afb099731a00aabea13e04d544f9215bfa4b;hpb=e5b94e6072287d39a777a3cedd0f10a66c58a2b5;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index db14afb0..250ca6d0 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -240,10 +240,10 @@ gint main(gint argc, gchar **argv) of the rc */ i = parse_startup(); - /* start up config which sets up with the parser */ - config_startup(i); /* register all the available actions */ actions_startup(reconfigure); + /* start up config which sets up with the parser */ + config_startup(i); /* parse/load user options */ if (parse_load_rc(NULL, &doc, &node)) { @@ -376,8 +376,8 @@ gint main(gint argc, gchar **argv) sn_shutdown(reconfigure); window_shutdown(reconfigure); event_shutdown(reconfigure); - actions_shutdown(reconfigure); config_shutdown(); + actions_shutdown(reconfigure); modkeys_shutdown(reconfigure); } while (reconfigure); }