Merge branch 'master' into chaz

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

diff --git a/openbox/actions/all.h b/openbox/actions/all.h
index 909836ae7a837ac566e17fca56ef3ef2beb8824e..54d63195de6d24480d6256719f439464a4ca3753 100644 (file)
--- a/openbox/actions/all.h
+++ b/openbox/actions/all.h
@@ -10,7 +10,6 @@ void action_showdesktop_startup(void);
 void action_reconfigure_startup(void);
 void action_exit_startup(void);
 void action_restart_startup(void);
-void action_session_startup(void);
 void action_cyclewindows_startup(void);
 void action_breakchroot_startup(void);
 void action_close_startup(void);
@@ -32,6 +31,7 @@ void action_directionalwindows_startup(void);
 void action_resize_startup(void);
 void action_decorations_startup(void);
 void action_desktop_startup(void);
+void action_dock_startup(void);
 void action_resizerelative_startup(void);
 void action_addremovedesktop_startup(void);
 void action_dockautohide_startup(void);
@@ -40,5 +40,7 @@ void action_movetoedge_startup(void);
 void action_growtoedge_startup(void);
 void action_if_startup(void);
 void action_focustobottom_startup(void);
+/* 3.4-compatibility */
+void action_shadelowerraise_startup(void);
 
 #endif