diff options
| author | marha <marha@users.sourceforge.net> | 2010-06-11 14:16:16 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-06-11 14:16:16 +0000 |
| commit | d1e4f4b8546c7955c66dd023bfd6ef437db9d21d (patch) | |
| tree | 529985e77bfc95aa95fe5b540e8f42b0ef041206 /xorg-server/randr/randr.c | |
| parent | 13919cf85a6ca41d97238de13344aba59e0f7680 (diff) | |
| parent | 4c61bf84b11e26e6f22648668c95ea760a379163 (diff) | |
| download | vcxsrv-d1e4f4b8546c7955c66dd023bfd6ef437db9d21d.tar.gz vcxsrv-d1e4f4b8546c7955c66dd023bfd6ef437db9d21d.tar.bz2 vcxsrv-d1e4f4b8546c7955c66dd023bfd6ef437db9d21d.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/randr/randr.c')
| -rw-r--r-- | xorg-server/randr/randr.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/xorg-server/randr/randr.c b/xorg-server/randr/randr.c index b843f588d..e816461d8 100644 --- a/xorg-server/randr/randr.c +++ b/xorg-server/randr/randr.c @@ -54,11 +54,9 @@ static int SProcRRDispatch (ClientPtr pClient); int RREventBase;
int RRErrorBase;
RESTYPE RRClientType, RREventType; /* resource types for event masks */
-static int RRClientPrivateKeyIndex;
-DevPrivateKey RRClientPrivateKey = &RRClientPrivateKeyIndex;
+DevPrivateKeyRec RRClientPrivateKeyRec;
-static int rrPrivKeyIndex;
-DevPrivateKey rrPrivKey = &rrPrivKeyIndex;
+DevPrivateKeyRec rrPrivKeyRec;
static void
RRClientCallback (CallbackListPtr *list,
@@ -215,6 +213,9 @@ Bool RRInit (void) return FALSE;
RRGeneration = serverGeneration;
}
+ if (!dixRegisterPrivateKey(&rrPrivKeyRec, PRIVATE_SCREEN, 0))
+ return FALSE;
+
return TRUE;
}
@@ -329,9 +330,9 @@ RRExtensionInit (void) if (RRNScreens == 0) return;
- if (!dixRequestPrivate(RRClientPrivateKey,
- sizeof (RRClientRec) +
- screenInfo.numScreens * sizeof (RRTimesRec)))
+ if (!dixRegisterPrivateKey(&RRClientPrivateKeyRec, PRIVATE_CLIENT,
+ sizeof (RRClientRec) +
+ screenInfo.numScreens * sizeof (RRTimesRec)))
return;
if (!AddCallback (&ClientStateCallback, RRClientCallback, 0))
return;
|