Merge branch 'sunweaver-pr/randr-regression-fix-re-adding-RegisterResourceName-calls' into 3.6.x

nx-X11/programs/Xserver/randr/randr.c

@@ -461,6 +461,11 @@ RRExtensionInit(void)
         );
     if (!RRClientType)
         return;
+
+#ifdef NXAGENT_SERVER
+    RegisterResourceName(RRClientType, "RandRClient");
+#endif
+
     RREventType = CreateNewResourceType(RRFreeEvents
 #ifndef NXAGENT_SERVER
                                         , "RandREvent"
@@ -468,6 +473,11 @@ RRExtensionInit(void)
         );
     if (!RREventType)
         return;
+
+#ifdef NXAGENT_SERVER
+    RegisterResourceName(RREventType, "RandREvent");
+#endif
+
     extEntry = AddExtension(RANDR_NAME, RRNumberEvents, RRNumberErrors,
                             ProcRRDispatch, SProcRRDispatch,
                             NULL, StandardMinorOpcode);

nx-X11/programs/Xserver/randr/rrcrtc.c

@@ -972,6 +972,10 @@ RRCrtcInit(void)
     if (!RRCrtcType)
         return FALSE;
 
+#ifdef NXAGENT_SERVER
+    RegisterResourceName(RRCrtcType, "CRTC");
+#endif
+
     return TRUE;
 }
 

nx-X11/programs/Xserver/randr/rrmode.c

@@ -326,6 +326,9 @@ RRModeInit(void)
     if (!RRModeType)
         return FALSE;
 
+#ifdef NXAGENT_SERVER
+    RegisterResourceName(RRModeType, "MODE");
+#endif
     return TRUE;
 }
 

nx-X11/programs/Xserver/randr/rroutput.c

@@ -429,6 +429,10 @@ RROutputInit(void)
     if (!RROutputType)
         return FALSE;
 
+#ifdef NXAGENT_SERVER
+    RegisterResourceName(RROutputType, "OUTPUT");
+#endif
+
     return TRUE;
 }
 

nx-X11/programs/Xserver/randr/rrprovider.c

@@ -440,6 +440,10 @@ RRProviderInit(void)
     if (!RRProviderType)
         return FALSE;
 
+#ifdef NXAGENT_SERVER
+    RegisterResourceName(RRProviderType, "Provider");
+#endif
+
     return TRUE;
 }