[PULL updated] regression fix for f3410b97cf9b48a47bee3d15d232f8a88e75f4ef

[Peter Hutterer]

Replaces previous pull request, at first I thought I still needed reviews
but Chase had already looked at them. The new patches in this tree fix the
crasher on shutdown, a regression introduced in
f3410b97cf9b48a47bee3d15d232f8a88e75f4ef.

The following changes since commit 42ae2e8199fe875319978249963de7499607988b:

  xkb: Allocate size_syms correctly when width of a type increases (2012-06-04 11:28:44 +1000)

are available in the git repository at:

  git://people.freedesktop.org/~whot/xserver for-keith

for you to fetch changes up to 4c68f5d395c66f28b56e488cb3cd12f36820357b:

  dix: disable all devices before shutdown (2012-06-07 14:13:51 +1000)

----------------------------------------------------------------
Chase Douglas (1):
      test/touch: Initialize device name

Peter Hutterer (13):
      xkb: warn if XKB SlowKeys have been automatically enabled
      include: add BUG_RETURN_* macros
      Replace a few BUG_WARN with BUG_RETURN_VAL
      dix: use BUG_RETURN_VAL for pairing errors
      dix: change "still paired warning" to use BUG_RETURN_VAL
      dix: rename shadowing loop variable in TouchResizeQueue
      dix: drop client argument from PairDevices - unused
      dix: return early from DisableDevice if the device is already disabled
      dix: move freeing the sprite into a function
      dix: free the sprite when disabling the device
      dix: disable non-sprite-owners first when disabling paired devices
      Xi: drop forced unpairing when changing the hierarchy
      dix: disable all devices before shutdown

 Xi/exevents.c          |   25 ++++++++------------
 Xi/xichangehierarchy.c |    6 -----
 dix/devices.c          |   61 ++++++++++++++++++++++++++++++------------------
 dix/events.c           |   12 ++++++++++
 dix/getevents.c        |    5 +---
 dix/main.c             |    4 ++++
 dix/touch.c            |   23 +++++++-----------
 include/dix.h          |    2 ++
 include/input.h        |    2 +-
 include/misc.h         |   12 ++++++++++
 test/touch.c           |    5 ++++
 xkb/xkbAccessX.c       |    9 +++++--
 12 files changed, 101 insertions(+), 65 deletions(-)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20120607/18a8bfa1/attachment-0001.pgp>