summaryrefslogtreecommitdiff
path: root/randr/rrxinerama.c
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@tycho.nsa.gov>2007-11-20 17:37:48 -0500
committerEamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil>2007-11-20 17:37:48 -0500
commit546d46224e355d4f00232da5538548e3c8853e40 (patch)
tree790854d331e59d9fbfa7c0be2bc7267caefe36ca /randr/rrxinerama.c
parentfd2d83d5bf5b35c8a2b05f725486be166783921e (diff)
Revert "registry: Register XINERAMA extension protocol names."
This reverts commit b9f5ab98c8dea36dcce1ad15fd2e059a77e77c39. Moving all the names into dix/registry.c
Diffstat (limited to 'randr/rrxinerama.c')
-rw-r--r--randr/rrxinerama.c26
1 files changed, 5 insertions, 21 deletions
diff --git a/randr/rrxinerama.c b/randr/rrxinerama.c
index c49980256..896f61fb5 100644
--- a/randr/rrxinerama.c
+++ b/randr/rrxinerama.c
@@ -71,7 +71,6 @@
#include "randrstr.h"
#include "swaprep.h"
#include <X11/extensions/panoramiXproto.h>
-#include "registry.h"
#define RR_XINERAMA_MAJOR_VERSION 1
#define RR_XINERAMA_MINOR_VERSION 1
@@ -424,8 +423,6 @@ RRXineramaResetProc(ExtensionEntry* extEntry)
void
RRXineramaExtensionInit(void)
{
- ExtensionEntry *extEntry;
-
#ifdef PANORAMIX
if(!noPanoramiXExtension)
return;
@@ -439,22 +436,9 @@ RRXineramaExtensionInit(void)
if (screenInfo.numScreens > 1)
return;
- extEntry = AddExtension(PANORAMIX_PROTOCOL_NAME, 0, 0,
- ProcRRXineramaDispatch,
- SProcRRXineramaDispatch,
- RRXineramaResetProc,
- StandardMinorOpcode);
-
- RegisterRequestName(extEntry->base, X_PanoramiXQueryVersion,
- PANORAMIX_PROTOCOL_NAME ":QueryVersion");
- RegisterRequestName(extEntry->base, X_PanoramiXGetState,
- PANORAMIX_PROTOCOL_NAME ":GetState");
- RegisterRequestName(extEntry->base, X_PanoramiXGetScreenCount,
- PANORAMIX_PROTOCOL_NAME ":GetScreenCount");
- RegisterRequestName(extEntry->base, X_PanoramiXGetScreenSize,
- PANORAMIX_PROTOCOL_NAME ":GetScreenSize");
- RegisterRequestName(extEntry->base, X_XineramaIsActive,
- PANORAMIX_PROTOCOL_NAME ":IsActive");
- RegisterRequestName(extEntry->base, X_XineramaQueryScreens,
- PANORAMIX_PROTOCOL_NAME ":QueryScreens");
+ (void) AddExtension(PANORAMIX_PROTOCOL_NAME, 0,0,
+ ProcRRXineramaDispatch,
+ SProcRRXineramaDispatch,
+ RRXineramaResetProc,
+ StandardMinorOpcode);
}