wow... this is a big commit...

[chaz/openbox] / openbox / client_list_menu.c

diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
index dd8cad8bcf01e672a90dc823b2f6c7c7df44fcfe..d703babdf334621d3e0308a964fa7a8b14e6c19e 100644 (file)
--- a/openbox/client_list_menu.c
+++ b/openbox/client_list_menu.c
@@ -1,6 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    client_list_menu.c for the Openbox window manager
+   Copyright (c) 2006        Mikael Magnusson
    Copyright (c) 2003        Ben Jansens
 
    This program is free software; you can redistribute it and/or modify
@@ -50,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;
@@ -74,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;
@@ -100,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);
     }
 }