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

Only copy execute_func to the more_menu.

Browse source 
Also don't bother copying NULL around in menu_new.
This commit is contained in:
Mikael Magnusson 2007-08-07 05:15:48 +02:00
parent f2b94f18a5
commit c870786774
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
openbox/menu.c
View file

@ -370,13 +370,6 @@ ObMenu* menu_new(const gchar *name, const gchar *title,
self->more_menu->data = data; self->more_menu->data = data;
self->more_menu->shortcut = g_unichar_tolower(g_utf8_get_char("M")); self->more_menu->shortcut = g_unichar_tolower(g_utf8_get_char("M"));
self->more_menu->show_func = self->show_func;
self->more_menu->hide_func = self->hide_func;
self->more_menu->update_func = self->update_func;
self->more_menu->execute_func = self->execute_func;
self->more_menu->destroy_func = self->destroy_func;
self->more_menu->place_func = self->place_func;
return self; return self;
} }
@ -613,19 +606,16 @@ ObMenuEntry* menu_add_separator(ObMenu *self, gint id, const gchar *label)
void menu_set_show_func(ObMenu *self, ObMenuShowFunc func) void menu_set_show_func(ObMenu *self, ObMenuShowFunc func)
{ {
self->show_func = func; self->show_func = func;
self->more_menu->show_func = func; /* keep it in sync */
} }
void menu_set_hide_func(ObMenu *self, ObMenuHideFunc func) void menu_set_hide_func(ObMenu *self, ObMenuHideFunc func)
{ {
self->hide_func = func; self->hide_func = func;
self->more_menu->hide_func = func; /* keep it in sync */
} }
void menu_set_update_func(ObMenu *self, ObMenuUpdateFunc func) void menu_set_update_func(ObMenu *self, ObMenuUpdateFunc func)
{ {
self->update_func = func; self->update_func = func;
self->more_menu->update_func = func; /* keep it in sync */
} }
void menu_set_execute_func(ObMenu *self, ObMenuExecuteFunc func) void menu_set_execute_func(ObMenu *self, ObMenuExecuteFunc func)
@ -637,13 +627,11 @@ void menu_set_execute_func(ObMenu *self, ObMenuExecuteFunc func)
void menu_set_destroy_func(ObMenu *self, ObMenuDestroyFunc func) void menu_set_destroy_func(ObMenu *self, ObMenuDestroyFunc func)
{ {
self->destroy_func = func; self->destroy_func = func;
self->more_menu->destroy_func = func; /* keep it in sync */
} }
void menu_set_place_func(ObMenu *self, ObMenuPlaceFunc func) void menu_set_place_func(ObMenu *self, ObMenuPlaceFunc func)
{ {
self->place_func = func; self->place_func = func;
self->more_menu->place_func = func; /* keep it in sync */
} }
ObMenuEntry* menu_find_entry_id(ObMenu *self, gint id) ObMenuEntry* menu_find_entry_id(ObMenu *self, gint id)