Combine the Exit and SessionLogout actions

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

diff --git a/openbox/actions/all.c b/openbox/actions/all.c
index f1ae5be2dddd929eb9ee8ec0ff237509e09c345e..47141ac6a65df57d31b1665c04ff9389b0d9c9de 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();
@@ -37,4 +37,5 @@ void action_all_startup()
     action_movetoedge_startup();
     action_growtoedge_startup();
     action_if_startup();
+    action_focustobottom_startup();
 }