diff options
| author | marha <marha@users.sourceforge.net> | 2009-12-20 22:23:03 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-12-20 22:23:03 +0000 |
| commit | c438f190eedc71ee8dd14e14fec660e98d3dc0bf (patch) | |
| tree | 9f128ed0356e62d09b44a720ac20bdc60566b66e /xorg-server/Xi/extinit.c | |
| parent | d842f9ef1c88a7aad04a78613548fc0f0638ac48 (diff) | |
| parent | d8432fdd4f13e9f9d1d44f5482faeb56562661a9 (diff) | |
| download | vcxsrv-c438f190eedc71ee8dd14e14fec660e98d3dc0bf.tar.gz vcxsrv-c438f190eedc71ee8dd14e14fec660e98d3dc0bf.tar.bz2 vcxsrv-c438f190eedc71ee8dd14e14fec660e98d3dc0bf.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/Xi/extinit.c')
| -rw-r--r-- | xorg-server/Xi/extinit.c | 7 |
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; |