diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-06-17 09:04:08 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-06-18 14:41:49 +1000 |
| commit | 09cef7573938e5c08007e578e1b638bc5e1796a8 (patch) | |
| tree | 632cdebe3af4771d8175a9403064a26d77e4edfd | |
| parent | bc2ff5365030ad8bc11efde430b1064080dd7098 (diff) | |
Xi: valuator/button labels are called labels now, not 'names'
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | Xi/extinit.c | 2 | ||||
| -rw-r--r-- | Xi/xiquerydevice.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Xi/extinit.c b/Xi/extinit.c index 20d49e13b..1376f4fca 100644 --- a/Xi/extinit.c +++ b/Xi/extinit.c @@ -712,7 +712,7 @@ SDeviceChangedEvent(xXIDeviceChangedEvent* from, xXIDeviceChangedEvent* to) case ValuatorClass: { xXIValuatorInfo* ai = (xXIValuatorInfo*)any; - swapl(&ai->name, n); + swapl(&ai->label, n); swapl(&ai->min.integral, n); swapl(&ai->min.frac, n); swapl(&ai->max.integral, n); diff --git a/Xi/xiquerydevice.c b/Xi/xiquerydevice.c index bc3088855..b316c86d1 100644 --- a/Xi/xiquerydevice.c +++ b/Xi/xiquerydevice.c @@ -314,7 +314,7 @@ ListValuatorInfo(DeviceIntPtr dev, xXIValuatorInfo* info, int axisnumber) info->type = ValuatorClass; info->length = sizeof(xXIValuatorInfo)/4; - info->name = v->axes[axisnumber].label; + info->label = v->axes[axisnumber].label; info->min.integral = v->axes[axisnumber].min_value; info->min.frac = 0; info->max.integral = v->axes[axisnumber].max_value; @@ -335,7 +335,7 @@ SwapValuatorInfo(DeviceIntPtr dev, xXIValuatorInfo* info) char n; swaps(&info->type, n); swaps(&info->length, n); - swapl(&info->name, n); + swapl(&info->label, n); swapl(&info->min.integral, n); swapl(&info->min.frac, n); swapl(&info->max.integral, n); |