summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--openbox/actions/all.c2
-rw-r--r--openbox/actions/all.h2
-rw-r--r--openbox/actions/menu.c (renamed from openbox/actions/showmenu.c)4
3 files changed, 4 insertions, 4 deletions
diff --git a/openbox/actions/all.c b/openbox/actions/all.c
index 7297d235..78bcb804 100644
--- 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 477b5fe9..b9ae7f43 100644
--- 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
index 4b12548f..64a4d279 100644
--- 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,