Skip to content
Snippets Groups Projects
Commit 051a0efc authored by Peter Hutterer's avatar Peter Hutterer Committed by Olivier Fourdan
Browse files

dix: check_modmap_change() returns Success, not true


Not sure what if anything calls XSetDeviceModifierMapping() but this would've
failed all the time. check_modmap_change() returns Success but we were
treating it like a boolean. Fix this.

Reported-by: Adam Jackson's avatarAdam Jackson <ajax@redhat.com>
Signed-off-by: default avatarPeter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: default avatarKeith Packard <keithp@keithp.com>
(cherry picked from commit 4fe02b8d)
parent 1508ea68
No related branches found
No related tags found
No related merge requests found
...@@ -282,7 +282,7 @@ change_modmap(ClientPtr client, DeviceIntPtr dev, KeyCode *modkeymap, ...@@ -282,7 +282,7 @@ change_modmap(ClientPtr client, DeviceIntPtr dev, KeyCode *modkeymap,
else if (!IsFloating(dev) && else if (!IsFloating(dev) &&
GetMaster(dev, MASTER_KEYBOARD)->lastSlave == dev) { GetMaster(dev, MASTER_KEYBOARD)->lastSlave == dev) {
/* If this fails, expect the results to be weird. */ /* If this fails, expect the results to be weird. */
if (check_modmap_change(client, dev->master, modmap)) if (check_modmap_change(client, dev->master, modmap) == Success)
do_modmap_change(client, dev->master, modmap); do_modmap_change(client, dev->master, modmap);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment