for (it = focus_order; it; it = g_list_next(it)) {
ObClient *c = it->data;
if (focus_valid_target(c, d->desktop,
- TRUE, TRUE, FALSE, FALSE, FALSE, FALSE)) {
+ TRUE, TRUE, FALSE, TRUE, FALSE, FALSE, FALSE)) {
ObMenuEntry *e;
empty = FALSE;
desktop_menus = g_slist_remove(desktop_menus, menu);
}
+static void self_cleanup(ObMenu *menu, gpointer data)
+{
+ menu_clear_entries(menu);
+
+ while (desktop_menus) {
+ menu_free(desktop_menus->data);
+ desktop_menus = g_slist_delete_link(desktop_menus, desktop_menus);
+ }
+}
+
static gboolean self_update(ObMenuFrame *frame, gpointer data)
{
ObMenu *menu = frame->menu;
menu = menu_new(MENU_NAME, _("Desktops"), TRUE, NULL);
menu_set_update_func(menu, self_update);
+ menu_set_cleanup_func(menu, self_cleanup);
menu_set_execute_func(menu, self_execute);
}