diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-02-18 11:45:29 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-02-22 14:35:45 +1000 |
| commit | 77113dd3eef03dd65b556b672d976817b3f4542e (patch) | |
| tree | fb1a4039af4f6ae7dd7af57a78ecde827faf0743 /dix/events.c | |
| parent | 2936635698619271a790004480a14285149277cb (diff) | |
input: Change a bunch of direct dev->u.master accesses to use GetMaster()
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
Diffstat (limited to 'dix/events.c')
| -rw-r--r-- | dix/events.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dix/events.c b/dix/events.c index b0e52f1c4..8b3bfb791 100644 --- a/dix/events.c +++ b/dix/events.c @@ -1407,7 +1407,7 @@ DetachFromMaster(DeviceIntPtr dev) if (!IsFloating(dev)) return; - dev->saved_master_id = dev->u.master->id; + dev->saved_master_id = GetMaster(dev, MASTER_ATTACHED)->id; AttachDevice(NULL, dev, NULL); } @@ -3237,7 +3237,7 @@ ProcWarpPointer(ClientPtr client) dev = PickPointer(client); for (tmp = inputInfo.devices; tmp; tmp = tmp->next) { - if ((tmp == dev) || (!IsMaster(tmp) && tmp->u.master == dev)) { + if (GetMaster(tmp, MASTER_ATTACHED) == dev) { rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixWriteAccess); if (rc != Success) return rc; |