for (it = focus_order; it; it = g_list_next(it)) {
ObClient *c = it->data;
- if (client_normal(c) && (!c->skip_taskbar || c->iconic) &&
- (c->desktop == d->desktop || c->desktop == DESKTOP_ALL))
- {
+ if (focus_valid_target(c, d->desktop,
+ TRUE, TRUE, FALSE, FALSE, FALSE, FALSE)) {
ObMenuEntry *e;
empty = FALSE;
e = menu_add_normal(menu, d->desktop, c->title, NULL, FALSE);
}
- if (config_menu_client_list_icons) {
+ if (config_menu_show_icons) {
e->data.normal.icon = client_icon(c);
RrImageRef(e->data.normal.icon);
e->data.normal.icon_alpha = c->iconic ? OB_ICONIC_ALPHA : 0xff;
{
DesktopData *d = data;
- g_free(d);
+ g_slice_free(DesktopData, d);
desktop_menus = g_slist_remove(desktop_menus, menu);
}
for (i = 0; i < screen_num_desktops; ++i) {
ObMenu *submenu;
gchar *name = g_strdup_printf("%s-%u", MENU_NAME, i);
- DesktopData *ddata = g_new(DesktopData, 1);
+ DesktopData *ddata = g_slice_new(DesktopData);
ddata->desktop = i;
submenu = menu_new(name, screen_desktop_names[i], FALSE, ddata);