diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-08-04 15:04:45 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-09-13 10:30:15 +1000 |
| commit | 29b9a10dad1ca780dc90f4f1f63fd11fd7d1221b (patch) | |
| tree | 3d2ca8742cb23f917da2f1143ff0d67f8e0e4914 /hw/dmx/input | |
| parent | a6f3f6a63ae76afbe01eb9049a63609476d2ed4d (diff) | |
dmx: XkbComponentNamesRec doesn't have a keymap field anymore.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'hw/dmx/input')
| -rw-r--r-- | hw/dmx/input/dmxcommon.c | 1 | ||||
| -rw-r--r-- | hw/dmx/input/dmxinputinit.c | 1 |
2 files changed, 0 insertions, 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); |