From af7d8e3fa09c59ce752052e362630a7cf0eafd6a Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 31 Dec 2020 00:58:04 +0100 Subject: nxagent: make nxagentXFixesInfo.Initialized a Boolean --- nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/Clipboard.h | 2 +- nx-X11/programs/Xserver/hw/nxagent/Events.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c index 2e14c08e7..8ac2241a6 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c @@ -225,7 +225,7 @@ const char * getXErrorString(int code) * Save the values queried from X server. */ -XFixesAgentInfoRec nxagentXFixesInfo = { -1, -1, -1, 0 }; +XFixesAgentInfoRec nxagentXFixesInfo = { -1, -1, -1, False }; extern Display *nxagentDisplay; @@ -2234,7 +2234,7 @@ Bool nxagentInitClipboard(WindowPtr pWin) XFixesSelectionClientCloseNotifyMask); } - nxagentXFixesInfo.Initialized = 1; + nxagentXFixesInfo.Initialized = True; } /* diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h index 4817a03e2..d401dae51 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h @@ -35,7 +35,7 @@ typedef struct _XFixesAgentInfo int Opcode; int EventBase; int ErrorBase; - int Initialized; + Bool Initialized; } XFixesAgentInfoRec; extern XFixesAgentInfoRec nxagentXFixesInfo; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index c5bdee63b..1758f649c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -2831,7 +2831,7 @@ int nxagentHandleXFixesSelectionNotify(XEvent *X) { XFixesSelectionEvent *xfixesEvent = (XFixesSelectionEvent *) X; - if (nxagentXFixesInfo.Initialized == 0) + if (!nxagentXFixesInfo.Initialized) { #ifdef DEBUG fprintf(stderr, "%s: XFixes not initialized - doing nothing.\n", __func__); -- cgit v1.2.3