--- a/open-src/xserver/xorg/resource-names.patch	Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/resource-names.patch	Fri May 15 09:36:46 2009 -0700
@@ -407,10 +407,10 @@
 index a7a21ec..ffc4299 100644
 --- a/Xi/extinit.c
 +++ b/Xi/extinit.c
-@@ -1143,8 +1143,10 @@ XInputExtensionInit(void)
- 	IEventBase = extEntry->eventBase;
+@@ -988,8 +988,10 @@ XInputExtensionInit(void)
  	AllExtensionVersions[IReqCode - 128] = thisversion;
  	MakeDeviceTypeAtoms();
+ 	XIInitKnownProperties();
 -	RT_INPUTCLIENT = CreateNewResourceType((DeleteType) InputClientGone);
 -	RegisterResourceName(RT_INPUTCLIENT, "INPUTCLIENT");
 +	RT_INPUTCLIENT = CreateNewResourceTypeNamed(