diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-20 15:26:41 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-20 15:26:41 +0000 |
| commit | f5fb2d27f1fd4976f0e77d97461a5e57ba6c9a23 (patch) | |
| tree | c76e9cb708483e65b114c08ed008880f478cae15 /xorg-server/randr/rrcrtc.c | |
| parent | b16c0295c9f95426980d567e93ae00c52545b3fa (diff) | |
| parent | 3319741e6f9fc3232eb40462a261271b9af2dcb2 (diff) | |
| download | vcxsrv-f5fb2d27f1fd4976f0e77d97461a5e57ba6c9a23.tar.gz vcxsrv-f5fb2d27f1fd4976f0e77d97461a5e57ba6c9a23.tar.bz2 vcxsrv-f5fb2d27f1fd4976f0e77d97461a5e57ba6c9a23.zip | |
svn merge "^/branches/released" .
Diffstat (limited to 'xorg-server/randr/rrcrtc.c')
| -rw-r--r-- | xorg-server/randr/rrcrtc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/randr/rrcrtc.c b/xorg-server/randr/rrcrtc.c index d22ad984b..45166cbff 100644 --- a/xorg-server/randr/rrcrtc.c +++ b/xorg-server/randr/rrcrtc.c @@ -254,7 +254,6 @@ RRDeliverCrtcEvent (ClientPtr client, WindowPtr pWin, RRCrtcPtr crtc) ce.type = RRNotify + RREventBase;
ce.subCode = RRNotify_CrtcChange;
- ce.sequenceNumber = client->sequence;
ce.timestamp = pScrPriv->lastSetTime.milliseconds;
ce.window = pWin->drawable.id;
ce.crtc = crtc->id;
@@ -635,6 +634,7 @@ RRCrtcInit (void) RRCrtcType = CreateNewResourceType (RRCrtcDestroyResource, "CRTC");
if (!RRCrtcType)
return FALSE;
+ SetResourceTypeErrorValue(RRCrtcType, RRErrorBase + BadRRCrtc);
return TRUE;
}
@@ -807,7 +807,7 @@ ProcRRSetCrtcConfig (ClientPtr client) {
if (outputs)
free(outputs);
- return (rc == BadValue) ? RRErrorBase + BadRROutput : rc;
+ return rc;
}
/* validate crtc for this output */
for (j = 0; j < outputs[i]->numCrtcs; j++)
|