[PULL updated] grab fixes, display name restriction, xephyr grab

[Peter Hutterer]

The following changes since commit 2ea973e12f5d954211e1d10085a4c74581b43aca:

  Bump version to 1.15.0 (2013-12-27 09:50:55 -0800)

are available in the git repository at:

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

for you to fetch changes up to 71baa466b1f6b02fe503f9a3089b7b9d61aa0f80:

  os: restrict display names to digits (2014-01-15 08:09:47 +1000)

----------------------------------------------------------------
Alan Coopersmith (3):
      If AllocGrab() fails to set up grab, don't copy to a NULL grab
      GrabDevice() needs to handle NULL return value from AllocGrab()
      CheckPassiveGrabsOnWindow() needs to handle NULL return value from AllocGrab()

Carlos Garnacho (1):
      Xi: Ensure DeviceChanged is emitted after grabs are deactivated

Peter Hutterer (2):
      ephyr: don't allow a shift+ctrl keygrab if mod1 was enabled
      os: restrict display names to digits

 Xi/exevents.c           | 19 ++++++++++++++++++-
 dix/events.c            |  6 +++++-
 dix/grabs.c             | 11 +++++------
 hw/kdrive/ephyr/ephyr.c | 27 ++++++++++++++++++++++++++-
 os/utils.c              | 27 +++++++++++++++++++++++++++
 5 files changed, 81 insertions(+), 9 deletions(-)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20140120/414f149e/attachment-0001.pgp>