From 95628b797e2b326ae15406df4f736e25f5d2f12f Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 20 Apr 2009 14:04:54 +1000
Subject: [PATCH] Xi: use the XI2 defines for AsyncPair, SyncDevice, etc, not
 the XI ones.

And don't allow some values on SDs either.
---
 Xi/xiallowev.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/Xi/xiallowev.c b/Xi/xiallowev.c
index 571255759..a8cf1b67f 100644
--- a/Xi/xiallowev.c
+++ b/Xi/xiallowev.c
@@ -72,23 +72,26 @@ ProcXIAllowEvents(ClientPtr client)
     time = ClientTimeToServerTime(stuff->time);
 
     switch (stuff->mode) {
-    case ReplayThisDevice:
+    case ReplayDevice:
 	AllowSome(client, time, dev, NOT_GRABBED);
 	break;
-    case SyncThisDevice:
+    case SyncDevice:
 	AllowSome(client, time, dev, FREEZE_NEXT_EVENT);
 	break;
-    case AsyncThisDevice:
+    case AsyncDevice:
 	AllowSome(client, time, dev, THAWED);
 	break;
-    case AsyncOtherDevices:
-	AllowSome(client, time, dev, THAW_OTHERS);
+    case AsyncPairedDevice:
+        if (dev->isMaster)
+            AllowSome(client, time, dev, THAW_OTHERS);
 	break;
-    case SyncAll:
-	AllowSome(client, time, dev, FREEZE_BOTH_NEXT_EVENT);
+    case SyncPair:
+        if (dev->isMaster)
+            AllowSome(client, time, dev, FREEZE_BOTH_NEXT_EVENT);
 	break;
-    case AsyncAll:
-	AllowSome(client, time, dev, THAWED_BOTH);
+    case AsyncPair:
+        if (dev->isMaster)
+            AllowSome(client, time, dev, THAWED_BOTH);
 	break;
     default:
 	client->errorValue = stuff->mode;