client_list_menu.c for the Openbox window manager
Copyright (c) 2006 Mikael Magnusson
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2003-2007 Dana Jansens
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
menu_clear_entries(menu);
- for (it = focus_order[d->desktop], i = 0; it; it = g_list_next(it), ++i) {
+ for (it = focus_order, i = 0; it; it = g_list_next(it), ++i) {
ObClient *c = it->data;
- if (client_normal(c) && (!c->skip_taskbar || c->iconic)) {
+ if (client_normal(c) && (!c->skip_taskbar || c->iconic) &&
+ (c->desktop == d->desktop || c->desktop == DESKTOP_ALL))
+ {
GSList *acts = NULL;
ObAction* act;
ObMenuEntry *e;
if (!icons && c->iconic) {
icons = TRUE;
- menu_add_separator(menu, -1);
+ menu_add_separator(menu, -1, NULL);
}
act = action_from_string("Activate",