X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus_cycle_popup.c;h=e0a8080f7ed16c2d9b118eb0822f816bb2f416b2;hb=6354baf43f2b4950be668371f14cc2b4495af065;hp=595fb9df752488caa76a0556787bf5880aaf0ec9;hpb=19ecd4d6d403e71abecb0e77f7ff0f4efa400be3;p=chaz%2Fopenbox

diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c
index 595fb9df..e0a8080f 100644
--- a/openbox/focus_cycle_popup.c
+++ b/openbox/focus_cycle_popup.c
@@ -174,7 +174,7 @@ static void popup_setup(ObFocusCyclePopup *p, gboolean create_targets,
     for (it = g_list_last(focus_order); it; it = g_list_previous(it)) {
         ObClient *ft = it->data;
 
-        if (focus_valid_target(ft,
+        if (focus_valid_target(ft, TRUE,
                                iconic_windows,
                                all_desktops,
                                dock_windows,
@@ -397,7 +397,6 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
            they can pick up the hilite changes in the backgroud */
         if (!p->mapped || newtarget == target || p->last_target == target) {
             const ObClientIcon *icon;
-            ObClientIcon *thumb;
             const gint row = i / icons_per_row; /* starting from 0 */
             const gint col = i % icons_per_row; /* starting from 0 */
             gint innerx, innery;
@@ -413,27 +412,17 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
                               innerx, innery, innerw, innerh);
 
             /* get the icon from the client */
-            if ((thumb = client_thumbnail(target->client))) {
-                p->a_icon->texture[0].data.rgba.width = thumb->width;
-                p->a_icon->texture[0].data.rgba.height = thumb->height;
-                p->a_icon->texture[0].data.rgba.alpha =
-                    target->client->iconic ? OB_ICONIC_ALPHA : 0xff;
-                p->a_icon->texture[0].data.rgba.data = thumb->data;
-            } else {
-                icon = client_icon(target->client, innerw, innerh);
-                p->a_icon->texture[0].data.rgba.width = icon->width;
-                p->a_icon->texture[0].data.rgba.height = icon->height;
-                p->a_icon->texture[0].data.rgba.alpha =
-                    target->client->iconic ? OB_ICONIC_ALPHA : 0xff;
-                p->a_icon->texture[0].data.rgba.data = icon->data;
-            }
+            icon = client_icon(target->client, innerw, innerh);
+            p->a_icon->texture[0].data.rgba.width = icon->width;
+            p->a_icon->texture[0].data.rgba.height = icon->height;
+            p->a_icon->texture[0].data.rgba.alpha =
+                target->client->iconic ? OB_ICONIC_ALPHA : 0xff;
+            p->a_icon->texture[0].data.rgba.data = icon->data;
 
             /* draw the icon */
             p->a_icon->surface.parentx = innerx;
             p->a_icon->surface.parenty = innery;
             RrPaint(p->a_icon, target->win, innerw, innerh);
-
-            clienticon_free(thumb);
         }
     }