diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-11-20 17:59:40 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-11-20 17:59:40 -0500 |
| commit | 0756d1271209e6ae14cc641dddca095271b43150 (patch) | |
| tree | c400ea600e2c77d8c29ce08bccd15680a746c5ad | |
| parent | 5aff37d1d69be493727856a29628bd782d50b90f (diff) | |
Revert "registry: Register APPGROUP extension protocol names."
This reverts commit b504678ba5407a6fd8d47d051305f7c3d5606dfe.
Moving all the names into dix/registry.c
| -rw-r--r-- | Xext/appgroup.c | 38 |
1 files changed, 8 insertions, 30 deletions
diff --git a/Xext/appgroup.c b/Xext/appgroup.c index 4fb402066..c40782df5 100644 --- a/Xext/appgroup.c +++ b/Xext/appgroup.c @@ -39,7 +39,6 @@ from The Open Group. #include "windowstr.h" #include "colormapst.h" #include "servermd.h" -#include "registry.h" #define _XAG_SERVER_ #include <X11/extensions/Xagstr.h> #include "xacestr.h" @@ -763,35 +762,14 @@ static void XagCallClientStateChange( void XagExtensionInit(INITARGS) { - ExtensionEntry *extEntry; - - if ((extEntry = AddExtension (XAGNAME, - 0, - XagNumberErrors, - ProcXagDispatch, - SProcXagDispatch, - XagResetProc, - StandardMinorOpcode))) { + if (AddExtension (XAGNAME, + 0, + XagNumberErrors, + ProcXagDispatch, + SProcXagDispatch, + XagResetProc, + StandardMinorOpcode)) { RT_APPGROUP = CreateNewResourceType (XagAppGroupFree); XaceRegisterCallback(XACE_AUTH_AVAIL, XagCallClientStateChange, NULL); - } else - return; - - RegisterRequestName(extEntry->base, X_XagQueryVersion, - XAGNAME ":QueryVersion"); - RegisterRequestName(extEntry->base, X_XagCreate, - XAGNAME ":Create"); - RegisterRequestName(extEntry->base, X_XagDestroy, - XAGNAME ":Destroy"); - RegisterRequestName(extEntry->base, X_XagGetAttr, - XAGNAME ":GetAttr"); - RegisterRequestName(extEntry->base, X_XagQuery, - XAGNAME ":Query"); - RegisterRequestName(extEntry->base, X_XagCreateAssoc, - XAGNAME ":CreateAssoc"); - RegisterRequestName(extEntry->base, X_XagDestroyAssoc, - XAGNAME ":DestroyAssoc"); - - RegisterErrorName(extEntry->errorBase + XagBadAppGroup, - XAGNAME ":BadAppGroup"); + } } |