mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-03 09:01:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

menu: use item->parent->id for client-list-combined-menu

Browse source 
...instead of item->id.
This commit is contained in:
tokyo4j 2025-03-10 16:26:46 +09:00 • committed by Johan Malm
parent 12f95543f0
commit ea4ea84499
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/menu/menu.c
View file

@ -1062,7 +1062,6 @@ update_client_list_combined_menu(struct server *server)
buf_add(&buffer, title); buf_add(&buffer, title);
current_item = item_create(menu, buffer.data, /*show arrow*/ false); current_item = item_create(menu, buffer.data, /*show arrow*/ false);
current_item->id = xstrdup(menu->id);
current_item->client_list_view = view; current_item->client_list_view = view;
fill_item("name.action", "Focus"); fill_item("name.action", "Focus");
fill_item("name.action", "Raise"); fill_item("name.action", "Raise");
@ -1070,7 +1069,6 @@ update_client_list_combined_menu(struct server *server)
} }
} }
current_item = item_create(menu, _("Go there..."), /*show arrow*/ false); current_item = item_create(menu, _("Go there..."), /*show arrow*/ false);
current_item->id = xstrdup(menu->id);
fill_item("name.action", "GoToDesktop"); fill_item("name.action", "GoToDesktop");
fill_item("to.action", workspace->name); fill_item("to.action", workspace->name);
} }
@ -1682,7 +1680,7 @@ menu_execute_item(struct menuitem *item)
* menu_close() and destroy_pipemenus() which we have to handle * menu_close() and destroy_pipemenus() which we have to handle
* before/after action_run() respectively. * before/after action_run() respectively.
*/ */
if (item->id && !strcmp(item->id, "client-list-combined-menu") if (!strcmp(item->parent->id, "client-list-combined-menu")
&& item->client_list_view) { && item->client_list_view) {
actions_run(item->client_list_view, server, &item->actions, NULL); actions_run(item->client_list_view, server, &item->actions, NULL);
} else { } else {