diff options
| author | Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au> | 2008-04-07 07:56:41 +0930 |
|---|---|---|
| committer | Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au> | 2008-04-07 07:56:41 +0930 |
| commit | fd06e8f8c1d82a9d91931e8532bee0fd9c9ca9ab (patch) | |
| tree | fda1a9d90f4a3e99af9da656939ff8c112cfeb33 /Xext/shm.c | |
| parent | b46a00918691cbd5ca80b6d3acae7614f93e073b (diff) | |
| parent | 6c0cfe3d43b177c4cfaf7e228f32c655f9a98459 (diff) | |
Merge branch 'master' into dcdc_rework
Conflicts:
Xext/xevie.c
dix/dispatch.c
Diffstat (limited to 'Xext/shm.c')
| -rw-r--r-- | Xext/shm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Xext/shm.c b/Xext/shm.c index 3e4071343..80780bbbc 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -655,7 +655,7 @@ ProcPanoramiXShmGetImage(ClientPtr client) return ProcShmGetImage(client); rc = dixLookupDrawable(&pDraw, stuff->drawable, client, 0, - DixUnknownAccess); + DixReadAccess); if (rc != Success) return rc; @@ -692,7 +692,7 @@ ProcPanoramiXShmGetImage(ClientPtr client) drawables[0] = pDraw; for(i = 1; i < PanoramiXNumScreens; i++) { rc = dixLookupDrawable(drawables+i, draw->info[i].id, client, 0, - DixUnknownAccess); + DixReadAccess); if (rc != Success) return rc; } @@ -767,7 +767,7 @@ ProcPanoramiXShmCreatePixmap( return BadImplementation; LEGAL_NEW_RESOURCE(stuff->pid, client); rc = dixLookupDrawable(&pDraw, stuff->drawable, client, M_ANY, - DixUnknownAccess); + DixGetAttrAccess); if (rc != Success) return rc; |