Merge branch 'backport' into work

[dana/openbox.git] / openbox / actions / all.c

diff --git a/openbox/actions/all.c b/openbox/actions/all.c
index 3fb4f81..4563e65 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();
@@ -21,16 +21,23 @@ void action_all_startup()
     action_iconify_startup();
     action_fullscreen_startup();
     action_maximize_startup();
-    action_maximizehorizontal_startup();
-    action_maximizevertical_startup();
-    action_moveto_startup();
+    action_moveresizeto_startup();
     action_moverelative_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_resizerelative_startup();
+    action_addremovedesktop_startup();
+    action_dockautohide_startup();
+    action_layer_startup();
+    action_movetoedge_startup();
+    action_growtoedge_startup();
+    action_if_startup();
+    action_focustobottom_startup();
+    /* 3.4-compatibility */
+    action_shadelowerraise_startup();
 }