allow focus to fallback to omnipresent windows, except during desktop switching which...

[chaz/openbox] / openbox / client_list_combined_menu.c

diff --git a/openbox/client_list_combined_menu.c b/openbox/client_list_combined_menu.c
index fcc95f69dfc1aa1cf4a3eb1ad04c256f0ed70048..cf85fd65b87468f2e06fc08ee313f0345707f756 100644 (file)
--- a/openbox/client_list_combined_menu.c
+++ b/openbox/client_list_combined_menu.c
@@ -82,6 +82,8 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data)
                     e->data.normal.icon_width = icon->width;
                     e->data.normal.icon_height = icon->height;
                     e->data.normal.icon_data = icon->data;
+                    e->data.normal.icon_alpha =
+                        c->iconic ? OB_ICONIC_ALPHA : 0xff;
                 }
             }
         }
@@ -109,7 +111,8 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data)
 
 /* executes it using the client in the actions, since we set that
    when we make the actions! */
-static void menu_execute(ObMenuEntry *self, guint state, gpointer data,
+static void menu_execute(ObMenuEntry *self, ObMenuFrame *f,
+                         ObClient *c, guint state, gpointer data,
                          Time time)
 {
     ObAction *a;
@@ -142,7 +145,7 @@ static void client_dest(ObClient *client, gpointer data)
 void client_list_combined_menu_startup(gboolean reconfig)
 {
     if (!reconfig)
-        client_add_destructor(client_dest, NULL);
+        client_add_destroy_notify(client_dest, NULL);
 
     combined_menu = menu_new(MENU_NAME, _("Windows"), TRUE, NULL);
     menu_set_update_func(combined_menu, self_update);
@@ -152,5 +155,5 @@ void client_list_combined_menu_startup(gboolean reconfig)
 void client_list_combined_menu_shutdown(gboolean reconfig)
 {
     if (!reconfig)
-        client_remove_destructor(client_dest);
+        client_remove_destroy_notify(client_dest);
 }