g_assert(menu_parse_state.parent == NULL);
if (!reconfig)
- client_add_destructor(client_dest, NULL);
+ client_add_destroy_notify(client_dest, NULL);
}
void menu_shutdown(gboolean reconfig)
{
if (!reconfig)
- client_remove_destructor(client_dest);
+ client_remove_destroy_notify(client_dest);
parse_shutdown(menu_parse_inst);
menu_parse_inst = NULL;
self->more_menu->data = data;
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;
}
g_free(self->name);
g_free(self->title);
g_free(self->execute);
+ g_free(self->more_menu);
g_free(self);
}
-void menu_unref(ObMenu *menu)
+void menu_free(ObMenu *menu)
{
if (menu)
g_hash_table_remove(menu_hash, menu->name);
void menu_set_show_func(ObMenu *self, ObMenuShowFunc func)
{
- self->show_func = func;
+ do {
+ self->show_func = func;
+ self = self->more_menu;
+ } while (self);
}
void menu_set_hide_func(ObMenu *self, ObMenuHideFunc func)
{
- self->hide_func = func;
+ do {
+ self->hide_func = func;
+ self = self->more_menu;
+ } while (self);
}
void menu_set_update_func(ObMenu *self, ObMenuUpdateFunc func)
{
- self->update_func = func;
+ do {
+ self->update_func = func;
+ self = self->more_menu;
+ } while (self);
}
void menu_set_execute_func(ObMenu *self, ObMenuExecuteFunc func)
{
- self->execute_func = func;
+ do {
+ self->execute_func = func;
+ self = self->more_menu;
+ } while (self);
}
void menu_set_destroy_func(ObMenu *self, ObMenuDestroyFunc func)
{
- self->destroy_func = func;
+ do {
+ self->destroy_func = func;
+ self = self->more_menu;
+ } while (self);
}
void menu_set_place_func(ObMenu *self, ObMenuPlaceFunc func)
{
- self->place_func = func;
+ do {
+ self->place_func = func;
+ self = self->more_menu;
+ } while (self);
}
ObMenuEntry* menu_find_entry_id(ObMenu *self, gint id)