From a541e826c9310d3051e53834833c6c3a08654148 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 17:50:26 -0500
Subject: [PATCH] Revert "registry: Register WINDOWSWM extension protocol
 names."

This reverts commit 4c3285c883cc50a91bc5262bbc9d073d816f860a.

Moving all the names into dix/registry.c
---
 hw/xwin/winwindowswm.c | 31 +------------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/hw/xwin/winwindowswm.c b/hw/xwin/winwindowswm.c
index 1356465d9..e1994de84 100755
--- a/hw/xwin/winwindowswm.c
+++ b/hw/xwin/winwindowswm.c
@@ -41,7 +41,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "scrnintstr.h"
 #include "servermd.h"
 #include "swaprep.h"
-#include "registry.h"
 #define _WINDOWSWM_SERVER_
 #include "windowswmstr.h"
 
@@ -106,35 +105,7 @@ winWindowsWMExtensionInit ()
       WMErrorBase = extEntry->errorBase;
       WMEventBase = extEntry->eventBase;
       EventSwapVector[WMEventBase] = (EventSwapPtr) SNotifyEvent;
-    } else
-      return;
-
-  RegisterRequestName(WMReqCode, X_WindowsWMQueryVersion,
-		      WINDOWSWMNAME ":QueryVersion");
-  RegisterRequestName(WMReqCode, X_WindowsWMFrameGetRect,
-		      WINDOWSWMNAME ":FrameGetRect");
-  RegisterRequestName(WMReqCode, X_WindowsWMFrameDraw,
-		      WINDOWSWMNAME ":FrameDraw");
-  RegisterRequestName(WMReqCode, X_WindowsWMFrameSetTitle,
-		      WINDOWSWMNAME ":FrameSetTitle");
-  RegisterRequestName(WMReqCode, X_WindowsWMDisableUpdate,
-		      WINDOWSWMNAME ":DisableUpdate");
-  RegisterRequestName(WMReqCode, X_WindowsWMReenableUpdate,
-		      WINDOWSWMNAME ":ReenableUpdate");
-  RegisterRequestName(WMReqCode, X_WindowsWMSelectInput,
-		      WINDOWSWMNAME ":SelectInput");
-  RegisterRequestName(WMReqCode, X_WindowsWMSetFrontProcess,
-		      WINDOWSWMNAME ":SetFrontProcess");
-
-  RegisterEventName(WMEventBase + WindowsWMControllerNotify,
-		    WINDOWSWMNAME ":ControllerNotify");
-  RegisterEventName(WMEventBase + WindowsWMActivationNotify,
-		    WINDOWSWMNAME ":ActivationNotify");
-
-  RegisterErrorName(WMErrorBase + WindowsWMClientNotLocal,
-		    WINDOWSWMNAME ":ClientNotLocal");
-  RegisterErrorName(WMErrorBase + WindowsWMOperationNotSupported,
-		    WINDOWSWMNAME ":OperationNotSupported");
+    }
 }
 
 /*ARGSUSED*/