summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2011-05-03 02:39:55 +0100
committerPeter Hutterer <peter.hutterer@who-t.net>2011-05-06 13:15:22 +1000
commit72b6639c83df74767094a5e0c2861fdc5ea03ecd (patch)
treeecedb6012e01258fe1974c0681a39fd715d06773
parent70cef8d8baf058bacaff87ef49e3851628269597 (diff)
XKB: Don't send unnecessary NewKeyboardNotifies
In the XKB GetKeyboardByName handler, we had the following pseudocode: if (device was last slave of its MD) { XkbCopyDeviceKeymap(master, slave); XkbSendNewKeyboardNotify(slave, &notify); } Even if the SendNewKeyboardNotify line nominated the correct device, which it didn't, it's unnecessary as XkbCopyDeviceKeymap already sends a NewKeyboardNotify on the destination device. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--xkb/xkb.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/xkb/xkb.c b/xkb/xkb.c
index 4044d333d..c4cb74015 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -5902,10 +5902,8 @@ ProcXkbGetKbdByName(ClientPtr client)
if (!IsMaster(dev)) {
DeviceIntPtr master = GetMaster(dev, MASTER_KEYBOARD);
- if (master && master->lastSlave == dev) {
+ if (master && master->lastSlave == dev)
XkbCopyDeviceKeymap(master, dev);
- XkbSendNewKeyboardNotify(dev,&nkn);
- }
}
}
if ((new!=NULL)&&(new!=xkb)) {