From: Dana Jansens Date: Fri, 13 Jul 2007 21:14:33 +0000 (-0400) Subject: move menu action back to ShowMenu X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=6689ad2320ecb7856f5277acb73b6df213fa98c4;p=chaz%2Fopenbox move menu action back to ShowMenu --- diff --git a/openbox/actions/all.c b/openbox/actions/all.c index f1ae5be2..430d781d 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_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 eb465e5f..62d3faa8 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_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 64a4d279..a36648a2 100644 --- 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; }