From ff6126f44005388bbb2fc2fc2946891162abb3c0 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 4 Feb 2017 15:22:20 +0100 Subject: Xserver/randr: Regression fix introduced by c2b1f48. Re-introduce RegisterResourceName() calls after each CreateNewResourceType() call. Fixes ArcticaProject/nx-libs#309. --- nx-X11/programs/Xserver/randr/rrmode.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'nx-X11/programs/Xserver/randr/rrmode.c') diff --git a/nx-X11/programs/Xserver/randr/rrmode.c b/nx-X11/programs/Xserver/randr/rrmode.c index a2bbec7d9..8f8d2d0aa 100644 --- a/nx-X11/programs/Xserver/randr/rrmode.c +++ b/nx-X11/programs/Xserver/randr/rrmode.c @@ -326,6 +326,9 @@ RRModeInit(void) if (!RRModeType) return FALSE; +#ifdef NXAGENT_SERVER + RegisterResourceName(RRModeType, "MODE"); +#endif return TRUE; } -- cgit v1.2.3 From 52c3c80d75081b91ff27cb8ab37ca943980d424d Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 15 Feb 2017 09:59:00 +0100 Subject: Naming change: Security*Access -> Dix*Access Backported from X.org: commit 6c46645cfc1afda8aeabfe0ed4d9342673b702f1 Author: Eamon Walsh Date: Thu Dec 14 14:45:42 2006 -0500 Naming change: Security*Access -> Dix*Access Backported-to-NX-by: Mike Gabriel --- nx-X11/programs/Xserver/randr/rrmode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11/programs/Xserver/randr/rrmode.c') diff --git a/nx-X11/programs/Xserver/randr/rrmode.c b/nx-X11/programs/Xserver/randr/rrmode.c index 8f8d2d0aa..876ebea42 100644 --- a/nx-X11/programs/Xserver/randr/rrmode.c +++ b/nx-X11/programs/Xserver/randr/rrmode.c @@ -360,7 +360,7 @@ ProcRRCreateMode(ClientPtr client) #ifndef NXAGENT_SERVER rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess); #else - pWin = SecurityLookupWindow(stuff->window, client, SecurityReadAccess); + pWin = SecurityLookupWindow(stuff->window, client, DixReadAccess); rc = pWin ? Success : BadWindow; #endif if (rc != Success) -- cgit v1.2.3