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/rroutput.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'nx-X11/programs/Xserver/randr/rroutput.c') diff --git a/nx-X11/programs/Xserver/randr/rroutput.c b/nx-X11/programs/Xserver/randr/rroutput.c index 07fda36b5..e5f69e010 100644 --- a/nx-X11/programs/Xserver/randr/rroutput.c +++ b/nx-X11/programs/Xserver/randr/rroutput.c @@ -429,6 +429,10 @@ RROutputInit(void) if (!RROutputType) return FALSE; +#ifdef NXAGENT_SERVER + RegisterResourceName(RROutputType, "OUTPUT"); +#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/rroutput.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nx-X11/programs/Xserver/randr/rroutput.c') diff --git a/nx-X11/programs/Xserver/randr/rroutput.c b/nx-X11/programs/Xserver/randr/rroutput.c index e5f69e010..c4da7d534 100644 --- a/nx-X11/programs/Xserver/randr/rroutput.c +++ b/nx-X11/programs/Xserver/randr/rroutput.c @@ -587,7 +587,7 @@ ProcRRSetOutputPrimary(ClientPtr client) #ifndef NXAGENT_SERVER ret = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess); #else - pWin = SecurityLookupWindow(stuff->window, client, SecurityReadAccess); + pWin = SecurityLookupWindow(stuff->window, client, DixReadAccess); ret = pWin ? Success : BadWindow; #endif @@ -645,7 +645,7 @@ ProcRRGetOutputPrimary(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 -- cgit v1.2.3