Merge branch 'master' into chaz

[chaz/openbox] / openbox / actions / all.c

diff --git a/openbox/actions/all.c b/openbox/actions/all.c
index 430d781d844a56e1c6ed28ef5d92596613bcda1b..332e79ca6c92911949ddb269f113751adb755858 100644 (file)
--- a/openbox/actions/all.c
+++ b/openbox/actions/all.c
@@ -1,6 +1,6 @@
 #include "all.h"
 
-void action_all_startup()
+void action_all_startup(void)
 {
     action_execute_startup();
     action_debug_startup();
@@ -30,6 +30,7 @@ void action_all_startup()
     action_resize_startup();
     action_decorations_startup();
     action_desktop_startup();
+    action_dock_startup();
     action_resizerelative_startup();
     action_addremovedesktop_startup();
     action_dockautohide_startup();
@@ -37,4 +38,7 @@ void action_all_startup()
     action_movetoedge_startup();
     action_growtoedge_startup();
     action_if_startup();
+    action_focustobottom_startup();
+    /* 3.4-compatibility */
+    action_shadelowerraise_startup();
 }