Merge branch 'master' into chaz

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

diff --git a/openbox/actions/all.c b/openbox/actions/all.c
index c4d7982ca9b3ec7f56a8e432a2567d5e5d6bcaa3..332e79ca6c92911949ddb269f113751adb755858 100644 (file)
--- a/openbox/actions/all.c
+++ b/openbox/actions/all.c
@@ -1,10 +1,10 @@
 #include "all.h"
 
-void action_all_startup()
+void action_all_startup(void)
 {
     action_execute_startup();
     action_debug_startup();
-    action_menu_startup();
+    action_showmenu_startup();
     action_showdesktop_startup();
     action_reconfigure_startup();
     action_exit_startup();
@@ -26,11 +26,11 @@ void action_all_startup()
     action_shade_startup();
     action_kill_startup();
     action_omnipresent_startup();
-    action_directionalcyclewindows_startup();
-    action_directionaltargetwindow_startup();
+    action_directionalwindows_startup();
     action_resize_startup();
     action_decorations_startup();
     action_desktop_startup();
+    action_dock_startup();
     action_resizerelative_startup();
     action_addremovedesktop_startup();
     action_dockautohide_startup();
@@ -38,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();
 }