Commit 42f76dde authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel

nxagent: make nxagentVerbose a Boolean

parent bd336c92
...@@ -178,7 +178,7 @@ static void nxagentParseOptionString(char*); ...@@ -178,7 +178,7 @@ static void nxagentParseOptionString(char*);
static int nxagentGetDialogName(void); static int nxagentGetDialogName(void);
char nxagentVerbose = 0; Bool nxagentVerbose = False;
char *nxagentKeystrokeFile = NULL; char *nxagentKeystrokeFile = NULL;
...@@ -964,7 +964,7 @@ int ddxProcessArgument(int argc, char *argv[], int i) ...@@ -964,7 +964,7 @@ int ddxProcessArgument(int argc, char *argv[], int i)
if (!strcmp(argv[i], "-verbose")) if (!strcmp(argv[i], "-verbose"))
{ {
nxagentVerbose = 1; nxagentVerbose = True;
return 1; return 1;
} }
......
...@@ -106,7 +106,7 @@ static int nxagentPrintError(Display *dpy, XErrorEvent *event, FILE *fp); ...@@ -106,7 +106,7 @@ static int nxagentPrintError(Display *dpy, XErrorEvent *event, FILE *fp);
int nxagentErrorHandler(Display *dpy, XErrorEvent *event) int nxagentErrorHandler(Display *dpy, XErrorEvent *event)
{ {
if (nxagentVerbose == 1) if (nxagentVerbose)
{ {
nxagentPrintError(dpy, event, stderr); nxagentPrintError(dpy, event, stderr);
} }
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
extern char *nxagentClientsLogName; extern char *nxagentClientsLogName;
extern char nxagentVerbose; extern Bool nxagentVerbose;
int nxagentErrorHandler(Display *dpy, XErrorEvent *event); int nxagentErrorHandler(Display *dpy, XErrorEvent *event);
......
...@@ -1959,7 +1959,7 @@ FIXME: Don't enqueue the KeyRelease event if the key was not already ...@@ -1959,7 +1959,7 @@ FIXME: Don't enqueue the KeyRelease event if the key was not already
if (nxagentExposeQueue.exposures[nxagentExposeQueue.start].serial != X.xconfigure.x) if (nxagentExposeQueue.exposures[nxagentExposeQueue.start].serial != X.xconfigure.x)
{ {
#ifdef WARNING #ifdef WARNING
if (nxagentVerbose == 1) if (nxagentVerbose)
{ {
fprintf(stderr, "%s: Requested ConfigureNotify changes didn't take place.\n", __func__); fprintf(stderr, "%s: Requested ConfigureNotify changes didn't take place.\n", __func__);
} }
......
...@@ -750,7 +750,7 @@ static XFontStruct *nxagentLoadBestQueryFont(Display* dpy, char *fontName, FontP ...@@ -750,7 +750,7 @@ static XFontStruct *nxagentLoadBestQueryFont(Display* dpy, char *fontName, FontP
if (numFontFields <= FIELDS) if (numFontFields <= FIELDS)
{ {
#ifdef WARNING #ifdef WARNING
if (nxagentVerbose == 1) if (nxagentVerbose)
{ {
fprintf(stderr, "nxagentLoadBestQueryFont: WARNING! Font name in non standard format.\n"); fprintf(stderr, "nxagentLoadBestQueryFont: WARNING! Font name in non standard format.\n");
} }
...@@ -817,7 +817,7 @@ static XFontStruct *nxagentLoadBestQueryFont(Display* dpy, char *fontName, FontP ...@@ -817,7 +817,7 @@ static XFontStruct *nxagentLoadBestQueryFont(Display* dpy, char *fontName, FontP
} }
#ifdef WARNING #ifdef WARNING
if (nxagentVerbose == 1) if (nxagentVerbose)
{ {
fprintf(stderr, "nxagentLoadBestQueryFont: WARNING! Failed to load font '%s'. Replacing with '%s'.\n", fprintf(stderr, "nxagentLoadBestQueryFont: WARNING! Failed to load font '%s'. Replacing with '%s'.\n",
fontName, substFontBuf); fontName, substFontBuf);
......
...@@ -598,7 +598,7 @@ Bool nxagentReconnectSession(void) ...@@ -598,7 +598,7 @@ Bool nxagentReconnectSession(void)
if (nxagentResetKeyboard() == 0) if (nxagentResetKeyboard() == 0)
{ {
#ifdef WARNING #ifdef WARNING
if (nxagentVerbose == 1) if (nxagentVerbose)
{ {
fprintf(stderr, "%s: Failed to reset keyboard device.\n", __func__); fprintf(stderr, "%s: Failed to reset keyboard device.\n", __func__);
} }
...@@ -699,7 +699,7 @@ nxagentReconnectError: ...@@ -699,7 +699,7 @@ nxagentReconnectError:
if (*nxagentGetReconnectError() == '\0') if (*nxagentGetReconnectError() == '\0')
{ {
#ifdef WARNING #ifdef WARNING
if (nxagentVerbose == 1) if (nxagentVerbose)
{ {
fprintf(stderr, "nxagentReconnectSession: WARNING! The reconnect error message is not set. Failed step is [%d].\n", fprintf(stderr, "nxagentReconnectSession: WARNING! The reconnect error message is not set. Failed step is [%d].\n",
failedStep); failedStep);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment