nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move menu action back to ShowMenu

Browse source
This commit is contained in:
Dana Jansens 2007-07-13 17:14:33 -04:00
parent c6f2875d61
commit 6689ad2320
3 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
openbox/actions/all.c
View file

@ -4,7 +4,7 @@ void action_all_startup()
{ {
action_execute_startup(); action_execute_startup();
action_debug_startup(); action_debug_startup();
action_menu_startup(); action_showmenu_startup();
action_showdesktop_startup(); action_showdesktop_startup();
action_reconfigure_startup(); action_reconfigure_startup();
action_exit_startup(); action_exit_startup();

2
openbox/actions/all.h
View file

@ -5,7 +5,7 @@ void action_all_startup();
void action_execute_startup(); void action_execute_startup();
void action_debug_startup(); void action_debug_startup();
void action_menu_startup(); void action_showmenu_startup();
void action_showdesktop_startup(); void action_showdesktop_startup();
void action_reconfigure_startup(); void action_reconfigure_startup();
void action_exit_startup(); void action_exit_startup();

19
openbox/actions/menu.c → openbox/actions/showmenu.c
View file

@ -10,12 +10,9 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
static void free_func(gpointer options); static void free_func(gpointer options);
static gboolean run_func(ObActionsData *data, gpointer options); static gboolean run_func(ObActionsData *data, gpointer options);
void action_menu_startup() void action_showmenu_startup()
{ {
actions_register("Menu", actions_register("ShowMenu", setup_func, free_func, run_func,
setup_func,
free_func,
run_func,
NULL, NULL); NULL, NULL);
} }
@ -34,11 +31,8 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
static void free_func(gpointer options) static void free_func(gpointer options)
{ {
Options *o = options; Options *o = options;
g_free(o->name);
if (o) { g_free(o);
g_free(o->name);
g_free(o);
}
} }
/* Always return FALSE because its not interactive */ /* Always return FALSE because its not interactive */
@ -47,11 +41,8 @@ static gboolean run_func(ObActionsData *data, gpointer options)
Options *o = options; Options *o = options;
/* you cannot call ShowMenu from inside a menu */ /* you cannot call ShowMenu from inside a menu */
if (data->uact == OB_USER_ACTION_MENU_SELECTION) return FALSE; if (data->uact != OB_USER_ACTION_MENU_SELECTION && o->name)
if (o->name) {
menu_show(o->name, data->x, data->y, data->button != 0, data->client); menu_show(o->name, data->x, data->y, data->button != 0, data->client);
}
return FALSE; return FALSE;
} }