[PULL] mainly hw/xwin fixes

[Jon TURNEY]

Hi Keith,

Various fixes, mainly for hw/xwin. Please consider pulling into master.

Thanks.

The following changes since commit afa53fe7cffd430cf11f25ca818cb955a78c0c1c:

  Version 1.12.99.903 (1.13 RC3) (2012-07-25 14:29:48 -0700)

are available in the git repository at:

  git://people.freedesktop.org/~jturney/xserver master

for you to fetch changes up to 988d7ace19a009991a4528e783d1a94c2444c66a:

  glx: Do not report the GLX_INTEL_swap_event extension for indirect swrast
(2012-08-03 22:58:17 +0100)

----------------------------------------------------------------
Colin Harrison (1):
      os: Fix TMP fall-back in Win32TempDir()

Jon TURNEY (8):
      hw/xwin: Refactor Xutf8TextPropertyToString() from GetWindowName() as a
separate utility function
      hw/xwin: Rename WM_WM_HINTS_EVENT to WM_WM_ICON_EVENT
      hw/xwin: Also update icon when _NET_WM_ICON property changes
      hw/xwin: Make winOverrideIcon() thread-safe for icon data access
      hw/xwin: Fix winUpdateWindowPosition() not to assume WS_EX_APPWINDOW style
      hw/xwin: Introduce winProcessXEventsTimeout() to the concept of
fractions of a second
      glx: Don't note GLX_INTEL_swap_event as being required by GLX 1.4, it isn't.
      glx: Do not report the GLX_INTEL_swap_event extension for indirect swrast

Marc Haesen (1):
      hw/xwin: Fixes to pixelFormat <-> fbConfig conversion in WGL mode

 glx/extension_string.c           |    2 +-
 glx/glxscreens.c                 |    2 +-
 hw/xwin/glx/indirect.c           |   70 ++++---
 hw/xwin/win.h                    |    9 -
 hw/xwin/winclipboardwndproc.c    |   29 ++-
 hw/xwin/winmultiwindowicons.c    |  392 +++++++++++++++++++-------------------
 hw/xwin/winmultiwindowicons.h    |   42 ++++
 hw/xwin/winmultiwindowwindow.c   |   18 +-
 hw/xwin/winmultiwindowwm.c       |  202 +++++++++++++-------
 hw/xwin/winprefs.c               |   48 ++---
 hw/xwin/winprefs.h               |    2 +-
 hw/xwin/winwin32rootless.c       |    2 +-
 hw/xwin/winwin32rootlesswindow.c |   31 ---
 hw/xwin/winwindow.h              |   15 +--
 hw/xwin/winwindowswm.c           |    2 -
 os/utils.c                       |    2 +-
 16 files changed, 462 insertions(+), 406 deletions(-)
 create mode 100644 hw/xwin/winmultiwindowicons.h