diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-05-20 14:07:03 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-05-21 10:42:35 +1000 |
| commit | 1cce55cc0333a026474100cf2f784e220fd96473 (patch) | |
| tree | 3a37b9a9227b89e3211340448b38cb1462f2f9ac /Xi | |
| parent | 81b3b0cce088866dc3cda099d7c8d6655849fd43 (diff) | |
input: rename device->type to device->xinput_type.
This type is only used in XI to give a hint of what type this device may be.
Call it xinput_type for clarity.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'Xi')
| -rw-r--r-- | Xi/extinit.c | 2 | ||||
| -rw-r--r-- | Xi/listdev.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Xi/extinit.c b/Xi/extinit.c index 1f7772911..a8f8f1093 100644 --- a/Xi/extinit.c +++ b/Xi/extinit.c @@ -1079,7 +1079,7 @@ IResetProc(ExtensionEntry * unused) void AssignTypeAndName(DeviceIntPtr dev, Atom type, char *name) { - dev->type = type; + dev->xinput_type = type; dev->name = (char *)xalloc(strlen(name) + 1); strcpy(dev->name, name); } diff --git a/Xi/listdev.c b/Xi/listdev.c index e7d0a9d68..294fec999 100644 --- a/Xi/listdev.c +++ b/Xi/listdev.c @@ -175,7 +175,7 @@ CopySwapDevice(ClientPtr client, DeviceIntPtr d, int num_classes, dev = (xDeviceInfoPtr) * buf; dev->id = d->id; - dev->type = d->type; + dev->type = d->xinput_type; dev->num_classes = num_classes; if (d->isMaster && IsKeyboardDevice(d)) dev->use = IsXKeyboard; |