aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/Xi/extinit.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-12-20 21:08:15 +0000
committermarha <marha@users.sourceforge.net>2009-12-20 21:08:15 +0000
commitd8432fdd4f13e9f9d1d44f5482faeb56562661a9 (patch)
tree10b8d598d3c821cdb25569d4bd750b7ad8cae269 /xorg-server/Xi/extinit.c
parentd34fc70fab4607f70184206a592397c97c3e478e (diff)
downloadvcxsrv-d8432fdd4f13e9f9d1d44f5482faeb56562661a9.tar.gz
vcxsrv-d8432fdd4f13e9f9d1d44f5482faeb56562661a9.tar.bz2
vcxsrv-d8432fdd4f13e9f9d1d44f5482faeb56562661a9.zip
Switched to xorg-server-1.7.99.2
Diffstat (limited to 'xorg-server/Xi/extinit.c')
-rw-r--r--xorg-server/Xi/extinit.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/xorg-server/Xi/extinit.c b/xorg-server/Xi/extinit.c
index 0c1291903..b7910cd13 100644
--- a/xorg-server/Xi/extinit.c
+++ b/xorg-server/Xi/extinit.c
@@ -70,7 +70,6 @@ SOFTWARE.
#include "extinit.h"
#include "exglobals.h"
#include "swaprep.h"
-#include "registry.h"
#include "privates.h"
#include "protocol-versions.h"
@@ -1269,8 +1268,10 @@ XInputExtensionInit(void)
IEventBase = extEntry->eventBase;
XIVersion = thisversion;
MakeDeviceTypeAtoms();
- RT_INPUTCLIENT = CreateNewResourceType((DeleteType) InputClientGone);
- RegisterResourceName(RT_INPUTCLIENT, "INPUTCLIENT");
+ RT_INPUTCLIENT = CreateNewResourceType((DeleteType) InputClientGone,
+ "INPUTCLIENT");
+ if (!RT_INPUTCLIENT)
+ FatalError("Failed to add resource type for XI.\n");
FixExtensionEvents(extEntry);
ReplySwapVector[IReqCode] = (ReplySwapPtr) SReplyIDispatch;
EventSwapVector[DeviceValuator] = SEventIDispatch;