From 29b9a10dad1ca780dc90f4f1f63fd11fd7d1221b Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 4 Aug 2009 15:04:45 +1000 Subject: [PATCH] dmx: XkbComponentNamesRec doesn't have a keymap field anymore. Signed-off-by: Peter Hutterer --- hw/dmx/input/dmxcommon.c | 1 - hw/dmx/input/dmxinputinit.c | 1 - 2 files changed, 2 deletions(-) diff --git a/hw/dmx/input/dmxcommon.c b/hw/dmx/input/dmxcommon.c index 2bffb17e7..8c8cefa53 100644 --- a/hw/dmx/input/dmxcommon.c +++ b/hw/dmx/input/dmxcommon.c @@ -264,7 +264,6 @@ void dmxCommonKbdGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info) dmxCommonSaveState(priv); if (priv->xkb) { - info->names.keymap = NULL; #define NAME(x) \ priv->xkb->names->x ? XGetAtomName(priv->display,priv->xkb->names->x) : NULL info->names.keycodes = NAME(keycodes); diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c index 164613017..5f3579b58 100644 --- a/hw/dmx/input/dmxinputinit.c +++ b/hw/dmx/input/dmxinputinit.c @@ -362,7 +362,6 @@ void dmxKeyboardBellProc(int percent, DeviceIntPtr pDevice, static void dmxKeyboardFreeNames(XkbComponentNamesPtr names) { - if (names->keymap) XFree(names->keymap); if (names->keycodes) XFree(names->keycodes); if (names->types) XFree(names->types); if (names->compat) XFree(names->compat);