[MPlayer-cvslog] r33632 - trunk/gui/wm/ws.c

[ib]

Author: ib
Date: Thu Jun 16 19:40:55 2011
New Revision: 33632

Log:
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.

Modified:
   trunk/gui/wm/ws.c

Modified: trunk/gui/wm/ws.c
==============================================================================
--- trunk/gui/wm/ws.c	Thu Jun 16 17:03:18 2011	(r33631)
+++ trunk/gui/wm/ws.c	Thu Jun 16 19:40:55 2011	(r33632)
@@ -1537,6 +1537,7 @@ void wsSetIcon(Display *dsp, Window win,
     Atom iconatom;
     CARD32 data[2];
 
+    if (icon->normal) {
     wm = XGetWMHints(dsp, win);
 
     if (!wm)
@@ -1548,12 +1549,15 @@ void wsSetIcon(Display *dsp, Window win,
 
     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);