From: "Rodolfo García Peñas (kix)" <[email protected]>
The code removed in wIconUpdate() is never used, because net_icon_image
has always image except if the client doesn't have image. Because
net_icon_image uses wm_hints to get the image (and wm_net_icon), if
net_icon_image is false, then the removed part of the "if" is false too.
---
src/icon.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/icon.c b/src/icon.c
index e8ec87f..80631cb 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -613,17 +613,13 @@ void wIconUpdate(WIcon *icon, RImage *image)
/* Get the Pixmap from the WIcon's Window */
icon->file_image = get_rimage_icon_from_icon_win(icon);
- } else if ((wwin && wwin->net_icon_image) ||
- ((wwin && wwin->wm_hints &&
- (wwin->wm_hints->flags & IconPixmapHint)))) {
+ } else if (wwin && wwin->net_icon_image) {
/* Remove the icon image */
unset_icon_image(icon);
/* Get the icon from wwin->net_icon_image.
* wwin->net_icon_image is NULL only if no icon was
- * found. Then, the second part of the if is always
- * false '((wwin && wwin->wm_hints &&
- * (wwin->wm_hints->flags & IconPixmapHint))' */
+ * found. Then, return the default image */
icon->file_image = get_window_image_def(wwin);
} else {
/* Get the Pixmap from the user */
--
1.7.10.4
--
To unsubscribe, send mail to [email protected].
