mirror of
https://github.com/labwc/labwc.git
synced 2025-11-04 13:30:07 -05:00
menu: remove menu_free_from()
This commit is contained in:
parent
7cc0c47923
commit
853d71ee6d
1 changed files with 4 additions and 22 deletions
|
|
@ -1251,31 +1251,13 @@ menu_free(struct menu *menu)
|
||||||
zfree(menu);
|
zfree(menu);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* menu_free_from - free menu list starting from current point
|
|
||||||
* @from: point to free from (if NULL, all menus are freed)
|
|
||||||
*/
|
|
||||||
static void
|
|
||||||
menu_free_from(struct server *server, struct menu *from)
|
|
||||||
{
|
|
||||||
bool destroying = !from;
|
|
||||||
struct menu *menu, *tmp_menu;
|
|
||||||
wl_list_for_each_safe(menu, tmp_menu, &server->menus, link) {
|
|
||||||
if (menu == from) {
|
|
||||||
destroying = true;
|
|
||||||
}
|
|
||||||
if (!destroying) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
menu_free(menu);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
menu_finish(struct server *server)
|
menu_finish(struct server *server)
|
||||||
{
|
{
|
||||||
menu_free_from(server, NULL);
|
struct menu *menu, *tmp_menu;
|
||||||
|
wl_list_for_each_safe(menu, tmp_menu, &server->menus, link) {
|
||||||
|
menu_free(menu);
|
||||||
|
}
|
||||||
|
|
||||||
/* Reset state vars for starting fresh when Reload is triggered */
|
/* Reset state vars for starting fresh when Reload is triggered */
|
||||||
current_item = NULL;
|
current_item = NULL;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue