# HG changeset patch
# User ib
# Date 1308246055 0
# Node ID b71fac1884323800039237065a3057b1f93a5b9b
# Parent  10f9498fada18caeefb590d6a2a707e3eefba6ff
Check whether a specific icon is available.

If icons are no longer included in the source, but will be read from
files, then reading may fail and a particular icon (size) may not be
available.

This is a preparation for differently sized icons to come.

diff -r 10f9498fada1 -r b71fac188432 gui/wm/ws.c
--- a/gui/wm/ws.c	Thu Jun 16 15:03:18 2011 +0000
+++ b/gui/wm/ws.c	Thu Jun 16 17:40:55 2011 +0000
@@ -1537,6 +1537,7 @@
     Atom iconatom;
     CARD32 data[2];
 
+    if (icon->normal) {
     wm = XGetWMHints(dsp, win);
 
     if (!wm)
@@ -1548,12 +1549,15 @@
 
     XSetWMHints(dsp, win, wm);
     XFree(wm);
+    }
 
+    if (icon->small || icon->normal) {
     iconatom = XInternAtom(dsp, "KWM_WIN_ICON", False);
     data[0]  = (icon->small ? icon->small : icon->normal);
     data[1]  = (icon->small ? icon->small_mask : icon->normal_mask);
 
     XChangeProperty(dsp, win, iconatom, iconatom, 32, PropModeReplace, (unsigned char *)data, 2);
+    }
 
     if (icon->collection) {
         iconatom = XInternAtom(dsp, "_NET_WM_ICON", False);