aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Screen.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-10-30 21:20:21 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-10-30 21:20:21 +0200
commitb06b6b1efe84f5759da3cf6f9dfaf1c2c173aeb6 (patch)
tree0e8497952ce92d8c3f271cd1d6a04832b35d1b36 /nx-X11/programs/Xserver/hw/nxagent/Screen.c
parent1ef24c379f8d142180f77ecfe2ab43093c3b7a64 (diff)
parent70fde4c748a0466343d308c79ecd4853499b58f1 (diff)
downloadnx-libs-b06b6b1efe84f5759da3cf6f9dfaf1c2c173aeb6.tar.gz
nx-libs-b06b6b1efe84f5759da3cf6f9dfaf1c2c173aeb6.tar.bz2
nx-libs-b06b6b1efe84f5759da3cf6f9dfaf1c2c173aeb6.zip
Merge branch 'uli42-pr/various8' into 3.6.x
Attributes GH PR #1025: https://github.com/ArcticaProject/nx-libs/pull/1025
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Screen.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Screen.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index 31b8b68a3..7998f35f0 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -375,7 +375,7 @@ FIXME: We'll check for ReparentNotify and LeaveNotify events after
XEvent e;
#ifdef TEST
- fprintf(stderr, "%d: WARNING! Going to wait for the ReparentNotify event [%d].\n", __func__, i);
+ fprintf(stderr, "%s: WARNING! Going to wait for the ReparentNotify event [%d].\n", __func__, i);
#endif
if (XCheckTypedWindowEvent(nxagentDisplay, nxagentFullscreenWindow, ReparentNotify, &e))
@@ -988,7 +988,7 @@ Bool nxagentOpenScreen(ScreenPtr pScreen, int argc, char *argv[])
nxagentChangeOption(Fullscreen, False);
nxagentChangeOption(AllScreens, False);
- nxagentFullscreenWindow = 0;
+ nxagentFullscreenWindow = None;
resetAgentPosition = True;
}