aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Display.c
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2021-02-09 19:31:20 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-06-08 08:23:35 +0200
commit111ac2eed54438971554bd71115316472f1c9976 (patch)
treef7e0c910a042836181c98121d09508bb35c84693 /nx-X11/programs/Xserver/hw/nxagent/Display.c
parent8fe2c114084743e8726ae39089e3aa1491d22719 (diff)
downloadnx-libs-111ac2eed54438971554bd71115316472f1c9976.tar.gz
nx-libs-111ac2eed54438971554bd71115316472f1c9976.tar.bz2
nx-libs-111ac2eed54438971554bd71115316472f1c9976.zip
nxagent: make X2GO support optional
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Display.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Display.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c
index 89d49edf1..95b5aa3af 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c
@@ -92,7 +92,9 @@ is" without express or implied warranty.
#include "compext/Compext.h"
#include NXAGENT_ICON_NAME
+#ifdef X2GO
#include X2GOAGENT_ICON_NAME
+#endif
/*
* Set here the required log level.
@@ -1849,6 +1851,7 @@ Bool nxagentMakeIcon(Display *disp, Pixmap *nxIcon, Pixmap *nxMask)
{
char** agentIconData;
+#ifdef X2GO
/*
* selecting x2go icon when running as X2Go agent
*/
@@ -1857,6 +1860,7 @@ Bool nxagentMakeIcon(Display *disp, Pixmap *nxIcon, Pixmap *nxMask)
agentIconData = x2goagentIconData;
}
else
+#endif
{
agentIconData = nxagentIconData;
}