some first structural stuff for new actions

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 1e1e3bf0f5f6268478525550ba043c8cb46ecd42..db14afb099731a00aabea13e04d544f9215bfa4b 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -28,12 +28,14 @@
 #include "xerror.h"
 #include "prop.h"
 #include "screen.h"
+#include "actions.h"
 #include "startupnotify.h"
 #include "focus.h"
 #include "focus_cycle.h"
 #include "focus_cycle_indicator.h"
 #include "focus_cycle_popup.h"
 #include "moveresize.h"
+#include "composite.h"
 #include "frame.h"
 #include "keyboard.h"
 #include "mouse.h"
@@ -240,6 +242,8 @@ gint main(gint argc, gchar **argv)
 
                 /* start up config which sets up with the parser */
                 config_startup(i);
+                /* register all the available actions */
+                actions_startup(reconfigure);
 
                 /* parse/load user options */
                 if (parse_load_rc(NULL, &doc, &node)) {
@@ -297,6 +301,7 @@ gint main(gint argc, gchar **argv)
             window_startup(reconfigure);
             sn_startup(reconfigure);
             screen_startup(reconfigure);
+            composite_startup(reconfigure);
             grab_startup(reconfigure);
             propwin_startup(reconfigure);
             group_startup(reconfigure);
@@ -362,6 +367,7 @@ gint main(gint argc, gchar **argv)
             group_shutdown(reconfigure);
             propwin_shutdown(reconfigure);
             grab_shutdown(reconfigure);
+            composite_shutdown(reconfigure);
             screen_shutdown(reconfigure);
             focus_cycle_popup_shutdown(reconfigure);
             focus_cycle_indicator_shutdown(reconfigure);
@@ -370,6 +376,7 @@ gint main(gint argc, gchar **argv)
             sn_shutdown(reconfigure);
             window_shutdown(reconfigure);
             event_shutdown(reconfigure);
+            actions_shutdown(reconfigure);
             config_shutdown();
             modkeys_shutdown(reconfigure);
         } while (reconfigure);