dix: inline SProcRotateProperties()

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

dix/property.c

@@ -173,9 +173,17 @@ deliverPropertyNotifyEvent(WindowPtr pWin, int state, PropertyPtr pProp)
 int
 ProcRotateProperties(ClientPtr client)
 {
-    int delta, rc;
-
     REQUEST(xRotatePropertiesReq);
+    REQUEST_AT_LEAST_SIZE(xRotatePropertiesReq);
+
+    if (client->swapped) {
+        swapl(&stuff->window);
+        swaps(&stuff->nAtoms);
+        swaps(&stuff->nPositions);
+        SwapRestL(stuff);
+    }
+
+    int delta, rc;
     PropertyPtr *props;         /* array of pointer */
     PropertyPtr pProp, saved;
 

dix/swapreq.c

@@ -745,18 +745,6 @@ SProcChangeHosts(ClientPtr client)
     return ((*ProcVector[X_ChangeHosts]) (client));
 }
 
-int _X_COLD
-SProcRotateProperties(ClientPtr client)
-{
-    REQUEST(xRotatePropertiesReq);
-    REQUEST_AT_LEAST_SIZE(xRotatePropertiesReq);
-    swapl(&stuff->window);
-    swaps(&stuff->nAtoms);
-    swaps(&stuff->nPositions);
-    SwapRestL(stuff);
-    return ((*ProcVector[X_RotateProperties]) (client));
-}
-
 void _X_COLD
 SwapConnClientPrefix(xConnClientPrefix * pCCP)
 {

dix/swapreq.h

@@ -65,7 +65,6 @@ int SProcQueryBestSize(ClientPtr client);
 int SProcQueryColors(ClientPtr client);
 int SProcQueryExtension(ClientPtr client);
 int SProcReparentWindow(ClientPtr client);
-int SProcRotateProperties(ClientPtr client);
 int SProcSetClipRectangles(ClientPtr client);
 int SProcSetDashes(ClientPtr client);
 int SProcSetFontPath(ClientPtr client);

dix/tables.c

@@ -446,7 +446,7 @@ int (*SwappedProcVector[256]) (ClientPtr /* client */) = {
     ProcChangeAccessControl,
     ProcChangeCloseDownMode,
     ProcKillClient,
-    SProcRotateProperties,
+    ProcRotateProperties,
     ProcForceScreenSaver,               /* 115 */
     ProcSetPointerMapping,
     ProcGetPointerMapping,