X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=db14afb099731a00aabea13e04d544f9215bfa4b;hb=e5b94e6072287d39a777a3cedd0f10a66c58a2b5;hp=e8d5ae4ddfab1dd05234068adbc99dcf38e46e2b;hpb=83e7a03e3ab90ae353cd26d931bf66cbbf1becff;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index e8d5ae4d..db14afb0 100644
--- 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);
@@ -337,7 +342,7 @@ gint main(gint argc, gchar **argv)
                     frame_adjust_area(c->frame, TRUE, TRUE, FALSE);
                     /* the decor sizes may have changed, so the windows may
                        end up in new positions */
-                    client_reconfigure(c);
+                    client_reconfigure(c, FALSE);
                 }
             }
 
@@ -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);