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 /hw/kdrive | |
| 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 'hw/kdrive')
| -rw-r--r-- | hw/kdrive/ephyr/ephyr_draw.c | 5 | ||||
| -rw-r--r-- | hw/kdrive/src/kxv.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/hw/kdrive/ephyr/ephyr_draw.c b/hw/kdrive/ephyr/ephyr_draw.c index f25a9b43b..672e0e4ea 100644 --- a/hw/kdrive/ephyr/ephyr_draw.c +++ b/hw/kdrive/ephyr/ephyr_draw.c @@ -107,8 +107,7 @@ ephyrPrepareSolid(PixmapPtr pPix, int alu, Pixel pm, Pixel fg) tmpval[0] = alu; tmpval[1] = pm; tmpval[2] = fg; - ChangeGC(fakexa->pGC, GCFunction | GCPlaneMask | GCForeground, - tmpval); + dixChangeGC(NullClient, fakexa->pGC, GCFunction | GCPlaneMask | GCForeground, tmpval, NULL); ValidateGC(&pPix->drawable, fakexa->pGC); @@ -173,7 +172,7 @@ ephyrPrepareCopy(PixmapPtr pSrc, PixmapPtr pDst, int dx, int dy, int alu, tmpval[0] = alu; tmpval[1] = pm; - ChangeGC (fakexa->pGC, GCFunction | GCPlaneMask, tmpval); + dixChangeGC (NullClient, fakexa->pGC, GCFunction | GCPlaneMask, tmpval, NULL); ValidateGC(&pDst->drawable, fakexa->pGC); diff --git a/hw/kdrive/src/kxv.c b/hw/kdrive/src/kxv.c index 56f101f65..bf6600a09 100644 --- a/hw/kdrive/src/kxv.c +++ b/hw/kdrive/src/kxv.c @@ -1892,7 +1892,7 @@ KXVPaintRegion (DrawablePtr pDraw, RegionPtr pRgn, Pixel fg) val[0] = fg; val[1] = IncludeInferiors; - ChangeGC (pGC, GCForeground|GCSubwindowMode, val); + dixChangeGC (NullClient, pGC, GCForeground|GCSubwindowMode, val, NULL); ValidateGC (pDraw, pGC); |