diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-04-22 18:04:05 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-04-22 18:04:05 +0930 |
| commit | 8190ef87547b704848231bde10b1cdffc6442790 (patch) | |
| tree | 29cb6d5bdefcee879d103953a140373635726f17 /xkb | |
| parent | 179a082c26f9e562492ee2e59e7f44f949f39f9c (diff) | |
| parent | 2ddbfd345786aa39b6ccaed82a1ca5c145284ee3 (diff) | |
Merge branch 'master' into mpx
Conflicts:
Xext/EVI.c
Xext/appgroup.c
Xext/cup.c
Xext/mitmisc.c
Xext/sampleEVI.c
dix/window.c
Diffstat (limited to 'xkb')
| -rw-r--r-- | xkb/xkbActions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c index 7d099f261..41b4e4c8e 100644 --- a/xkb/xkbActions.c +++ b/xkb/xkbActions.c @@ -1023,7 +1023,7 @@ _XkbFilterDeviceBtn( XkbSrvInfoPtr xkbi, DeviceIntPtr dev; int button; - if (dev == inputInfo.keyboard) + if (xkbi->device == inputInfo.keyboard) return 0; if (filter->keycode==0) { /* initial press */ |