diff options
| author | marha <marha@users.sourceforge.net> | 2009-12-02 19:35:37 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-12-02 19:35:37 +0000 |
| commit | 8f2c5e2f41f211bed814be2889da16fc43e6f147 (patch) | |
| tree | e1f2715f63544d39302d6daa2cb0d4f53d295ebc /xorg-server/Xext/geext.c | |
| parent | b404fe88bb87f42267cab4682b81f38cc442e617 (diff) | |
| parent | 314d225f3a60cc0ea63c292a2c2ffe3609e7c739 (diff) | |
| download | vcxsrv-8f2c5e2f41f211bed814be2889da16fc43e6f147.tar.gz vcxsrv-8f2c5e2f41f211bed814be2889da16fc43e6f147.tar.bz2 vcxsrv-8f2c5e2f41f211bed814be2889da16fc43e6f147.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/Xext/geext.c')
| -rw-r--r-- | xorg-server/Xext/geext.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/xorg-server/Xext/geext.c b/xorg-server/Xext/geext.c index 6fad4aec0..2ba0ca824 100644 --- a/xorg-server/Xext/geext.c +++ b/xorg-server/Xext/geext.c @@ -168,12 +168,6 @@ GEClientCallback(CallbackListPtr *list, ClientPtr pClient = clientinfo->client; GEClientInfoPtr pGEClient = GEGetClient(pClient); - if (pGEClient == NULL) - { - pGEClient = xcalloc(1, sizeof(GEClientInfoRec)); - dixSetPrivate(&pClient->devPrivates, GEClientPrivateKey, pGEClient); - } - pGEClient->major_version = 0; pGEClient->minor_version = 0; } @@ -222,6 +216,9 @@ GEExtensionInit(void) { ExtensionEntry *extEntry; + if (!dixRequestPrivate(GEClientPrivateKey, sizeof(GEClientInfoRec))) + FatalError("GEExtensionInit: GE private request failed.\n"); + if(!AddCallback(&ClientStateCallback, GEClientCallback, 0)) { FatalError("GEExtensionInit: register client callback failed.\n"); |