diff options
| author | Jamey Sharp <jamey@minilop.net> | 2010-05-06 21:56:10 -0700 |
|---|---|---|
| committer | Jamey Sharp <jamey@minilop.net> | 2010-05-12 18:10:01 -0700 |
| commit | 04bad1b8a118a83064316d6e4327234aee19361e (patch) | |
| tree | db53939c7cf34aa3eb3b31e6af7d32c0b31af64c /dix/dixfonts.c | |
| parent | 65cedf39054cf3a1e695e84ac228cce9e8d48097 (diff) | |
Kill ChangeGC in favor of dixChangeGC.
This doesn't change any behavior, but it isn't clear whether NullClient
is correct in all cases. As ajax says,
> For most of these changes, I think it's correct to use NullClient,
> since they are server-initiated changes and should not fail for (eg)
> xace reasons. ... At any rate, you're certainly not changing any
> semantics by leaving them all as NullClient, so this patch can't be
> more wrong than before.
The call in CreateGC is particularly questionable.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'dix/dixfonts.c')
| -rw-r--r-- | dix/dixfonts.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dix/dixfonts.c b/dix/dixfonts.c index 378c38033..332fb9728 100644 --- a/dix/dixfonts.c +++ b/dix/dixfonts.c @@ -1261,7 +1261,7 @@ doPolyText(ClientPtr client, PTclosurePtr c) { if (pFont != c->pGC->font && c->pDraw) { - ChangeGC( c->pGC, GCFont, &fid); + dixChangeGC(NullClient, c->pGC, GCFont, &fid, NULL); ValidateGC(c->pDraw, c->pGC); if (c->reqType == X_PolyText8) c->polyText = (PolyTextPtr) c->pGC->ops->PolyText8; @@ -1404,7 +1404,7 @@ bail: /* Step 4 */ if (pFont != origGC->font) { - ChangeGC(origGC, GCFont, &fid); + dixChangeGC(NullClient, origGC, GCFont, &fid, NULL); ValidateGC(c->pDraw, origGC); } @@ -1423,7 +1423,7 @@ bail: if (c->slept) { ClientWakeup(c->client); - ChangeGC(c->pGC, clearGCmask, clearGC); + dixChangeGC(NullClient, c->pGC, clearGCmask, clearGC, NULL); /* Unreference the font from the scratch GC */ CloseFont(c->pGC->font, (Font)0); @@ -1580,7 +1580,7 @@ bail: if (c->slept) { ClientWakeup(c->client); - ChangeGC(c->pGC, clearGCmask, clearGC); + dixChangeGC(NullClient, c->pGC, clearGCmask, clearGC, NULL); /* Unreference the font from the scratch GC */ CloseFont(c->pGC->font, (Font)0); |