diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2006-09-29 00:35:07 +0300 |
|---|---|---|
| committer | Daniel Stone <daniels@endtroducing.fooishbar.org> | 2006-09-29 00:35:07 +0300 |
| commit | 5d99e05f05a42a82a9f02844df9bfebaa673759d (patch) | |
| tree | c216fe0ac3df77a2c5a1a6e8b6e988c6f94ffe65 | |
| parent | ad631afcf3fbc74024cddaaacd05d38addc047a2 (diff) | |
| parent | 58933757862c458e2da39bd464e50d9c0e41b313 (diff) | |
Merge branch 'input-hotplug' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
| -rw-r--r-- | Xi/selectev.c | 2 | ||||
| -rw-r--r-- | dix/events.c | 1 | ||||
| -rw-r--r-- | xkb/xkbUtils.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/Xi/selectev.c b/Xi/selectev.c index 1f6713ad4..7d3ef9d48 100644 --- a/Xi/selectev.c +++ b/Xi/selectev.c @@ -178,7 +178,7 @@ ProcXSelectExtensionEvent(register ClientPtr client) return Success; } - if (HandleDevicePresenceMask(client, pWin, (XEventClass *) & stuff[i], + if (HandleDevicePresenceMask(client, pWin, (XEventClass *) & stuff[1], &stuff->count) != Success) { SendErrorToClient(client, IReqCode, X_SelectExtensionEvent, 0, BadAlloc); diff --git a/dix/events.c b/dix/events.c index c2c03950d..34ee9fb15 100644 --- a/dix/events.c +++ b/dix/events.c @@ -135,6 +135,7 @@ of the copyright holder. #include <X11/extensions/XKBproto.h> #include <X11/extensions/XKBsrv.h> extern Bool XkbFilterEvents(ClientPtr, int, xEvent *); +extern Bool XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies); #endif #ifdef XCSECURITY diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c index 0fde727ea..cbf46d860 100644 --- a/xkb/xkbUtils.c +++ b/xkb/xkbUtils.c @@ -242,7 +242,7 @@ XkbMapChangesPtr mc; xkb->min_key_code= first; /* 1/12/95 (ef) -- XXX! should zero out the new maps */ changes->map.changed|= XkbKeycodesMask; -generate a NewKeyboard notify here? +/* generate a NewKeyboard notify here? */ } } #endif |