summaryrefslogtreecommitdiff
path: root/openbox/openbox.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-06-22 03:40:01 +0000
committerDana Jansens <danakj@orodu.net>2007-06-22 03:40:01 +0000
commitb76ec18d1c8857cf32598c822364298fc535c84e (patch)
tree93fc460b4e7eb63d47ed475e19c810c71a8d119f /openbox/openbox.c
parent780d1b0961e2eed5fea4645b4398fafb4adad73a (diff)
the execute action works again.
default hardcoded bindings are temporarily offline
Diffstat (limited to 'openbox/openbox.c')
-rw-r--r--openbox/openbox.c6
1 files changed, 3 insertions, 3 deletions
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);
}