From 03d44a4b8b265dbbffe91cd4cbeee91dcc45f768 Mon Sep 17 00:00:00 2001
From: David Reveman <davidr@novell.com>
Date: Wed, 19 Nov 2008 11:25:14 -0500
Subject: [PATCH] dmxActivateFakePointerGrab -> dmxActivateFakeGrab and
 dmxDeactivateFakePointerGrab -> dmxDeactivateFakeGrab.

---
 hw/dmx/dmxgrab.c  | 6 +++---
 hw/dmx/dmxgrab.h  | 6 +++---
 hw/dmx/dmxinput.c | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hw/dmx/dmxgrab.c b/hw/dmx/dmxgrab.c
index 7b2b4192a..ef29d7e06 100644
--- a/hw/dmx/dmxgrab.c
+++ b/hw/dmx/dmxgrab.c
@@ -301,8 +301,8 @@ dmxDeactivatePointerGrab (DeviceIntPtr pDev)
 }
 
 Bool
-dmxActivateFakePointerGrab (DeviceIntPtr pDev,
-			    GrabPtr      pGrab)
+dmxActivateFakeGrab (DeviceIntPtr pDev,
+		     GrabPtr      pGrab)
 {
     dmxDevicePrivPtr pDevPriv = DMX_GET_DEVICE_PRIV (pDev);
 
@@ -323,7 +323,7 @@ dmxActivateFakePointerGrab (DeviceIntPtr pDev,
 }
 
 void
-dmxDeactivateFakePointerGrab (DeviceIntPtr pDev)
+dmxDeactivateFakeGrab (DeviceIntPtr pDev)
 {
     dmxDevicePrivPtr pDevPriv = DMX_GET_DEVICE_PRIV (pDev);
 
diff --git a/hw/dmx/dmxgrab.h b/hw/dmx/dmxgrab.h
index 29913f537..fe0dc0b5e 100644
--- a/hw/dmx/dmxgrab.h
+++ b/hw/dmx/dmxgrab.h
@@ -40,9 +40,9 @@ extern void dmxActivatePointerGrab (DeviceIntPtr pDev,
 				    Bool         autoGrab);
 extern void dmxDeactivatePointerGrab (DeviceIntPtr pDev);
 
-extern Bool dmxActivateFakePointerGrab (DeviceIntPtr pDev,
-					GrabPtr      pGrab);
-extern void dmxDeactivateFakePointerGrab (DeviceIntPtr pDev);
+extern Bool dmxActivateFakeGrab (DeviceIntPtr pDev,
+				 GrabPtr      pGrab);
+extern void dmxDeactivateFakeGrab (DeviceIntPtr pDev);
 
 extern void dmxInitGrabs (void);
 extern void dmxResetGrabs (void);
diff --git a/hw/dmx/dmxinput.c b/hw/dmx/dmxinput.c
index 8bfebc458..acdfffb7a 100644
--- a/hw/dmx/dmxinput.c
+++ b/hw/dmx/dmxinput.c
@@ -484,7 +484,7 @@ dmxFakePointerGrab (DMXInputInfo *dmxInput)
 
 	newGrab.device = pDevice;
 
-	if (!dmxActivateFakePointerGrab (pDevice, &newGrab))
+	if (!dmxActivateFakeGrab (pDevice, &newGrab))
 	    return FALSE;
     }
 
@@ -506,7 +506,7 @@ dmxReleaseFakePointerGrab (DMXInputInfo *dmxInput)
 	if (!pDevice->button)
 	    continue;
 
-	dmxDeactivateFakePointerGrab (pDevice);
+	dmxDeactivateFakeGrab (pDevice);
     }
 }