From 242b4ee2d21aeb476344859ae34ed4cc977cc9e9 Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Mon, 19 Oct 2009 23:06:37 +0100 Subject: [PATCH] Resolve an inconsistency between libX11 and Xserver over GetModifierMapping libX11 ModMap.c believes that GetModifierMapping can never return an error Xserver devices.c believes that GetModifierMapping can return an error if the ModMap couldn't be generated According to the protocol document I have, libX11 is right, so adjust the server to send back an empty modmap if one couldn't be made... Signed-off-by: Jon TURNEY --- dix/devices.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dix/devices.c b/dix/devices.c index 6a79073..daeade3 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -1526,8 +1526,6 @@ ProcGetModifierMapping(ClientPtr client) ret = generate_modkeymap(client, PickKeyboard(client), &modkeymap, &max_keys_per_mod); - if (ret != Success) - return ret; memset(&rep, 0, sizeof(xGetModifierMappingReply)); rep.type = X_Reply; -- 1.6.4.2