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

[ib]

Author: ib
Date: Thu Jun 16 14:44:28 2011
New Revision: 33628

Log:
Revise wsSetIcon().

Group WMHints and KWM_WIN_ICON statements.
Use X11 Bool symbolic constant.

Modified:
   trunk/gui/wm/ws.c

Modified: trunk/gui/wm/ws.c
==============================================================================
--- trunk/gui/wm/ws.c	Thu Jun 16 14:31:42 2011	(r33627)
+++ trunk/gui/wm/ws.c	Thu Jun 16 14:44:28 2011	(r33628)
@@ -1532,8 +1532,8 @@ void wsSetShape(wsTWindow *win, char *da
 void wsSetIcon(Display *dsp, Window win, guiIcon_t *icon)
 {
     XWMHints *wm;
-    CARD32 data[2];
     Atom iconatom;
+    CARD32 data[2];
 
     wm = XGetWMHints(dsp, win);
 
@@ -1545,11 +1545,11 @@ void wsSetIcon(Display *dsp, Window win,
     wm->flags      |= IconPixmapHint | IconMaskHint;
 
     XSetWMHints(dsp, win, wm);
+    XFree(wm);
 
+    iconatom = XInternAtom(dsp, "KWM_WIN_ICON", False);
     data[0]  = icon->normal;
     data[1]  = icon->normal_mask;
-    iconatom = XInternAtom(dsp, "KWM_WIN_ICON", 0);
-    XChangeProperty(dsp, win, iconatom, iconatom, 32, PropModeReplace, (unsigned char *)data, 2);
 
-    XFree(wm);
+    XChangeProperty(dsp, win, iconatom, iconatom, 32, PropModeReplace, (unsigned char *)data, 2);
 }