Mercurial > mplayer.hg

changeset 33540:0dec83e053cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revise wsSetIcon(). Group WMHints and KWM_WIN_ICON statements. Use X11 Bool symbolic constant.
author ib
date Thu, 16 Jun 2011 12:44:28 +0000
parents 5bdc088113f7
children 729826b857cf
files gui/wm/ws.c
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/gui/wm/ws.c	Thu Jun 16 12:31:42 2011 +0000
+++ b/gui/wm/ws.c	Thu Jun 16 12:44:28 2011 +0000
@@ -1532,8 +1532,8 @@
 void wsSetIcon(Display *dsp, Window win, guiIcon_t *icon)
 {
     XWMHints *wm;
+    Atom iconatom;
     CARD32 data[2];
-    Atom iconatom;
 
     wm = XGetWMHints(dsp, win);
 
@@ -1545,11 +1545,11 @@
     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);
 }