rename showmenu to menu

diff --git a/openbox/actions/all.c b/openbox/actions/all.c
index 7297d2352ab0a8cf5327436fc4a9dee51187c8ca..78bcb804380159168228b9dde30f2520bce0a475 100644 (file)
--- a/openbox/actions/all.c
+++ b/openbox/actions/all.c
@@ -4,7 +4,7 @@ void action_all_startup()
 {
     action_execute_startup();
     action_debug_startup();
-    action_showmenu_startup();
+    action_menu_startup();
     action_showdesktop_startup();
     action_reconfigure_startup();
     action_exit_startup();

diff --git a/openbox/actions/all.h b/openbox/actions/all.h
index 477b5fe9ae975fba9a9aa9a381b05521f20a7f7c..b9ae7f43755893fc6c814485952ef7fe72877873 100644 (file)
--- a/openbox/actions/all.h
+++ b/openbox/actions/all.h
@@ -5,7 +5,7 @@ void action_all_startup();
 
 void action_execute_startup();
 void action_debug_startup();
-void action_showmenu_startup();
+void action_menu_startup();
 void action_showdesktop_startup();
 void action_reconfigure_startup();
 void action_exit_startup();

diff --git a/openbox/actions/showmenu.c b/openbox/actions/menu.c
similarity index 95%
rename from openbox/actions/showmenu.c
rename to openbox/actions/menu.c
index 4b12548f6dd4bf9d070ec07a654c2e1d917d6f82..64a4d27993163c218bc6f7b6bc948988e7b51e58 100644 (file)
--- a/openbox/actions/showmenu.c
+++ b/openbox/actions/menu.c
@@ -10,9 +10,9 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
 static void     free_func(gpointer options);
 static gboolean run_func(ObActionsData *data, gpointer options);
 
-void action_showmenu_startup()
+void action_menu_startup()
 {
-    actions_register("ShowMenu",
+    actions_register("Menu",
                      setup_func,
                      free_func,
                      run_func,