X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient_list_menu.c;h=5fbb3a631f9bd3cfd1c36b7a559ce2317a26d72f;hb=141c249b8cd3b94a722acc8c0225b3cbf83e5042;hp=dfd7c4e4543dd988e586ee7f920ce395f2c5faa2;hpb=d9f14c1d010860e658f4a9adc6682e0264b410aa;p=chaz%2Fopenbox

diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
index dfd7c4e4..5fbb3a63 100644
--- a/openbox/client_list_menu.c
+++ b/openbox/client_list_menu.c
@@ -2,7 +2,7 @@
 
    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
@@ -49,9 +49,11 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
 
     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) {
+        if (client_normal(c) && (!c->skip_taskbar || c->iconic) &&
+            (c->desktop == d->desktop || c->desktop == DESKTOP_ALL))
+        {
             GSList *acts = NULL;
             ObAction* act;
             ObMenuEntry *e;
@@ -61,7 +63,7 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
 
             if (!icons && c->iconic) {
                 icons = TRUE;
-                menu_add_separator(menu, -1);
+                menu_add_separator(menu, -1, NULL);
             }
 
             act = action_from_string("Activate",
@@ -75,7 +77,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 +104,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);
     }
 }