Merge branch 'master' into chaz

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

diff --git a/openbox/actions/all.c b/openbox/actions/all.c
index c86c4281abfde8fe76c59084314ea1a676d39e45..332e79ca6c92911949ddb269f113751adb755858 100644 (file)
--- a/openbox/actions/all.c
+++ b/openbox/actions/all.c
@@ -9,7 +9,6 @@ void action_all_startup(void)
     action_reconfigure_startup();
     action_exit_startup();
     action_restart_startup();
-    action_session_startup();
     action_cyclewindows_startup();
     action_breakchroot_startup();
     action_close_startup();
@@ -31,6 +30,7 @@ void action_all_startup(void)
     action_resize_startup();
     action_decorations_startup();
     action_desktop_startup();
+    action_dock_startup();
     action_resizerelative_startup();
     action_addremovedesktop_startup();
     action_dockautohide_startup();
@@ -39,4 +39,6 @@ void action_all_startup(void)
     action_growtoedge_startup();
     action_if_startup();
     action_focustobottom_startup();
+    /* 3.4-compatibility */
+    action_shadelowerraise_startup();
 }