]> git.mdlowis.com Git - proto/labwc.git/commitdiff
menu: use item->parent->id for client-list-combined-menu
authortokyo4j <hrak1529@gmail.com>
Mon, 10 Mar 2025 07:26:46 +0000 (16:26 +0900)
committerJohan Malm <johanmalm@users.noreply.github.com>
Mon, 10 Mar 2025 19:42:03 +0000 (19:42 +0000)
...instead of item->id.

src/menu/menu.c

index ebf16419dcddd26042007798b52482dcbb1063be..8139063cb12410c1cea0d91f89841304bdfba35b 100644 (file)
@@ -1062,7 +1062,6 @@ update_client_list_combined_menu(struct server *server)
                                buf_add(&buffer, title);
 
                                current_item = item_create(menu, buffer.data, /*show arrow*/ false);
-                               current_item->id = xstrdup(menu->id);
                                current_item->client_list_view = view;
                                fill_item("name.action", "Focus");
                                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->id = xstrdup(menu->id);
                fill_item("name.action", "GoToDesktop");
                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
         * 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) {
                actions_run(item->client_list_view, server, &item->actions, NULL);
        } else {