From a6335cf3d8b3f281944347d12a93fa38c70e8ada Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 28 Dec 2019 20:00:59 +0100 Subject: Screen.c: fix handling of NX_SHADOW atom Needs to be an XlibAtom! --- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 399a3ea53..bc998569f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -2566,12 +2566,6 @@ int nxagentShadowInit(ScreenPtr pScreen, WindowPtr pWin) XlibGC gc; XGCValues value; - #ifndef __CYGWIN32__ - - Atom nxagentShadowAtom; - - #endif - #ifdef TEST fprintf(stderr, "Info: Init shadow session. nxagentDisplayName [%s] " "nxagentDisplay [%p] nxagentShadowDisplayName [%s].\n", @@ -2627,14 +2621,13 @@ int nxagentShadowInit(ScreenPtr pScreen, WindowPtr pWin) } /* - * The shadow nxagent sets the _NX_SHADOW - * property on the master X server root - * window in order to notify its presence. + * The shadow nxagent sets the _NX_SHADOW property on the master X + * server root window in order to notify its presence. */ #ifndef __CYGWIN__ - nxagentShadowAtom = XInternAtom(nxagentShadowDisplay, "_NX_SHADOW", False); + XlibAtom nxagentShadowAtom = XInternAtom(nxagentShadowDisplay, "_NX_SHADOW", False); XChangeProperty(nxagentShadowDisplay, DefaultRootWindow(nxagentShadowDisplay), nxagentShadowAtom, XA_STRING, 8, PropModeReplace, NULL, 0); -- cgit v1.2.3