[PULL v2] xkb keymap loading

[Peter Hutterer]

In keeping up with current programming and practices I had a a goto fail bug
the last patch of this series. krh wasn't happy with this for some reason.
here is the same patchset, but this time with an abundance of braces too
keep the fail contained.

The following changes since commit 795066477ee81b5b82e490eac8bed6b656d01f17:

  config: search for PnPID on all parents (#75513) (2014-03-12 07:43:16 +1000)

are available in the git repository at:

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

for you to fetch changes up to 0e531fbb97868b9a869044fc5a4f6cb58de6751e:

  xkb: add XkbLoadKeymapFromString (2014-03-19 08:37:15 +1000)

----------------------------------------------------------------
Kristian Høgsberg (3):
      xkb: factor out xkb loading to LoadXkm
      xkb: add KeymapOrDefault
      xkb: add XkbLoadKeymapFromString

Peter Hutterer (2):
      xkb: constify XkbDDXOpenConfigFile
      xkb: add a callback to xkbcomp

Rui Matos (2):
      xkb: Factor out a function to copy a keymap's controls onto another
      xkb: Repurpose XkbCopyDeviceKeymap to apply a given keymap to a device

 Xi/exevents.c    |   2 +-
 include/input.h  |   6 ++
 include/xkbsrv.h |  11 ++-
 xkb/ddxLoad.c    | 242 ++++++++++++++++++++++++++++++++++++++++++-------------
 xkb/xkb.c        |  16 +---
 xkb/xkbInit.c    |  42 ++++++++--
 xkb/xkbUtils.c   |  37 +++++++--
 7 files changed, 270 insertions(+), 86 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/20140319/bee7c520/attachment.sig>