X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fclient_list_menu.c;h=d703babdf334621d3e0308a964fa7a8b14e6c19e;hb=19b480058e869a588ea20be5e29017ae2052e967;hp=dfd7c4e4543dd988e586ee7f920ce395f2c5faa2;hpb=d9f14c1d010860e658f4a9adc6682e0264b410aa;p=chaz%2Fopenbox diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c index dfd7c4e4..d703babd 100644 --- a/openbox/client_list_menu.c +++ b/openbox/client_list_menu.c @@ -51,7 +51,7 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data) for (it = focus_order[d->desktop], i = 0; it; it = g_list_next(it), ++i) { ObClient *c = it->data; - if (client_normal(c) && !c->skip_taskbar) { + if (client_normal(c) && (!c->skip_taskbar || c->iconic)) { GSList *acts = NULL; ObAction* act; ObMenuEntry *e; @@ -75,7 +75,8 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data) e = menu_add_normal(menu, i, (c->iconic ? c->icon_title : c->title), acts); - if (config_menu_client_list_icons && (icon = client_icon(c, 32, 32))) { + if (config_menu_client_list_icons + && (icon = client_icon(c, 32, 32))) { e->data.normal.icon_width = icon->width; e->data.normal.icon_height = icon->height; e->data.normal.icon_data = icon->data; @@ -101,13 +102,14 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data) /* executes it using the client in the actions, since we set that when we make the actions! */ -static void desk_menu_execute(ObMenuEntry *self, guint state, gpointer data) +static void desk_menu_execute(ObMenuEntry *self, guint state, gpointer data, + Time time) { ObAction *a; if (self->data.normal.actions) { a = self->data.normal.actions->data; - action_run(self->data.normal.actions, a->data.any.c, state); + action_run(self->data.normal.actions, a->data.any.c, state, time); } }