aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-12-28 20:00:59 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-01-06 00:50:30 +0100
commita6335cf3d8b3f281944347d12a93fa38c70e8ada (patch)
treebd9961b3f85349d8cdee3ced932846240df47257
parentc6a2fda07fbb0a18ac3c1ecb6bf96f2eea98d2c9 (diff)
downloadnx-libs-a6335cf3d8b3f281944347d12a93fa38c70e8ada.tar.gz
nx-libs-a6335cf3d8b3f281944347d12a93fa38c70e8ada.tar.bz2
nx-libs-a6335cf3d8b3f281944347d12a93fa38c70e8ada.zip
Screen.c: fix handling of NX_SHADOW atom
Needs to be an XlibAtom!
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Screen.c13
1 files 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);