summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-06-07 14:55:42 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-06-09 10:56:34 +1000
commit199dd64b809c7622b0f0bd94e1c5551c931ea1e5 (patch)
tree5395df241bb22df9f6331d24b05065057805e593 /src
parent27d39fdbfddec6bb92ee3d3b7ef6c21ab3026926 (diff)
Hierarchy changes should use "deviceid", not device.
Every other call/interface uses deviceid, so change for consistency. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src')
-rw-r--r--src/XIHierarchy.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/XIHierarchy.c b/src/XIHierarchy.c
index 813f622..83a7b99 100644
--- a/src/XIHierarchy.c
+++ b/src/XIHierarchy.c
@@ -112,7 +112,7 @@ XIChangeHierarchy(Display* dpy,
xXIRemoveMasterInfo* r = (xXIRemoveMasterInfo*)dptr;
r->type = R->type;
r->return_mode = R->returnMode;
- r->deviceid = R->device;
+ r->deviceid = R->deviceid;
r->length = sizeof(xXIRemoveMasterInfo)/4;
if (r->return_mode == XIAttachToMaster)
{
@@ -128,7 +128,7 @@ XIChangeHierarchy(Display* dpy,
xXIAttachSlaveInfo* c = (xXIAttachSlaveInfo*)dptr;
c->type = C->type;
- c->deviceid = C->device;
+ c->deviceid = C->deviceid;
c->length = sizeof(xXIAttachSlaveInfo)/4;
c->new_master = C->newMaster;
@@ -141,7 +141,7 @@ XIChangeHierarchy(Display* dpy,
xXIDetachSlaveInfo *d = (xXIDetachSlaveInfo*)dptr;
d->type = D->type;
- d->deviceid = D->device;
+ d->deviceid = D->deviceid;
d->length = sizeof(xXIDetachSlaveInfo)/4;
dptr += sizeof(xXIDetachSlaveInfo);
}