diff options
| author | Keith Packard <keithp@keithp.com> | 2014-10-27 15:39:26 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-10-27 15:39:26 -0700 |
| commit | 3a123fbdda56b24dc01a2308137144dc960e0d61 (patch) | |
| tree | 19ecde5269c6adf8d8bfe6f76d7e459349de07df /hw/xwin/winmultiwindowicons.c | |
| parent | 9b29fa957a397664463c7c78fbcc2f34d1993271 (diff) | |
| parent | 7ea4a21feed5ac5e71cc6d8141c97d6362402c5d (diff) | |
Merge remote-tracking branch 'jturney/master'
Conflicts:
hw/xwin/winpixmap.c
Adam removed a pile of windows code, including this file.
Diffstat (limited to 'hw/xwin/winmultiwindowicons.c')
| -rw-r--r-- | hw/xwin/winmultiwindowicons.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/xwin/winmultiwindowicons.c b/hw/xwin/winmultiwindowicons.c index 93d389d46..c22e68874 100644 --- a/hw/xwin/winmultiwindowicons.c +++ b/hw/xwin/winmultiwindowicons.c @@ -382,7 +382,7 @@ winXIconToHICON(Display * pDisplay, Window id, int iconSize) static int generation; uint32_t *icon, *icon_data = NULL; unsigned long int size; - unsigned long int type; + Atom type; int format; unsigned long int left; @@ -465,7 +465,7 @@ winXIconToHICON(Display * pDisplay, Window id, int iconSize) xImageIcon = XGetImage(pDisplay, hints->icon_pixmap, 0, 0, width, height, 0xFFFFFFFF, ZPixmap); - winDebug("winXIconToHICON: id 0x%x icon Ximage 0x%x\n", id, + winDebug("winXIconToHICON: id 0x%x icon Ximage 0x%p\n", id, xImageIcon); if (hints->icon_mask) |