move menu action back to ShowMenu

diff --git a/openbox/actions/all.c b/openbox/actions/all.c
index f1ae5be2dddd929eb9ee8ec0ff237509e09c345e..430d781d844a56e1c6ed28ef5d92596613bcda1b 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_menu_startup();
+    action_showmenu_startup();
     action_showdesktop_startup();
     action_reconfigure_startup();
     action_exit_startup();

diff --git a/openbox/actions/all.h b/openbox/actions/all.h
index eb465e5fad5b547f23aa17a7498412ba2571b9bc..62d3faa89672be357179e05e70cc8c45063e349b 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_menu_startup();
+void action_showmenu_startup();
 void action_showdesktop_startup();
 void action_reconfigure_startup();
 void action_exit_startup();

diff --git a/openbox/actions/menu.c b/openbox/actions/showmenu.c
similarity index 75%
rename from openbox/actions/menu.c
rename to openbox/actions/showmenu.c
index 64a4d27993163c218bc6f7b6bc948988e7b51e58..a36648a2651c9fca896d736697cc3c20b238b972 100644 (file)
--- a/openbox/actions/menu.c
+++ b/openbox/actions/showmenu.c
@@ -10,12 +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_menu_startup()
+void action_showmenu_startup()
 {
-    actions_register("Menu",
-                     setup_func,
-                     free_func,
-                     run_func,
+    actions_register("ShowMenu", setup_func, free_func, run_func,
                      NULL, NULL);
 }
 
@@ -34,11 +31,8 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
 static void free_func(gpointer options)
 {
     Options *o = options;
-
-    if (o) {
-        g_free(o->name);
-        g_free(o);
-    }
+    g_free(o->name);
+    g_free(o);
 }
 
 /* Always return FALSE because its not interactive */
@@ -47,11 +41,8 @@ static gboolean run_func(ObActionsData *data, gpointer options)
     Options *o = options;
 
     /* you cannot call ShowMenu from inside a menu */
-    if (data->uact == OB_USER_ACTION_MENU_SELECTION) return FALSE;
-
-    if (o->name) {
+    if (data->uact != OB_USER_ACTION_MENU_SELECTION && o->name)
         menu_show(o->name, data->x, data->y, data->button != 0, data->client);
-    }
 
     return FALSE;
 }