This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit f4adcbc596e3563b3fcad75e862b7be3a969f969 Author: Ulrich Sibiller <uli42@gmx.de> Date: Wed Dec 30 22:54:48 2020 +0100 nxagent: make nxagentUserDefinedFontPath a Boolean --- nx-X11/programs/Xserver/hw/nxagent/Args.c | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/Args.h | 2 +- nx-X11/programs/Xserver/hw/nxagent/Init.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c index a18b4f0f9..ee76fc795 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c @@ -116,7 +116,7 @@ is" without express or implied warranty. #undef DISABLE_SMART_SCHEDULE -int nxagentUserDefinedFontPath = 0; +Bool nxagentUserDefinedFontPath = False; /* * From X11/ImUtil.c. @@ -558,7 +558,7 @@ int ddxProcessArgument(int argc, char *argv[], int i) fprintf(stderr, "ddxProcessArgument: User defined font path [%s].\n", argv[i]); #endif - nxagentUserDefinedFontPath = 1; + nxagentUserDefinedFontPath = True; defaultFontPath = argv[i]; } else diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.h b/nx-X11/programs/Xserver/hw/nxagent/Args.h index c8f8907c3..aebb521a6 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Args.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.h @@ -97,7 +97,7 @@ void nxagentSetCoalescence(void); void nxagentShowVersionInfo(void); -extern int nxagentUserDefinedFontPath; +extern Bool nxagentUserDefinedFontPath; extern int nxagentRemoteMajor; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c index b6901cb38..d760b0c6a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Init.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c @@ -251,7 +251,7 @@ void InitOutput(ScreenInfo *scrInfo, int argc, char *argv[]) AddCallback(&ServerGrabCallback, nxagentGrabServerCallback, NULL); } - if (nxagentUserDefinedFontPath == 0) + if (!nxagentUserDefinedFontPath) { #ifdef TEST fprintf(stderr, "InitOutput: Calling nxagentVerifyDefaultFontPath.\n"); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git