diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-06-08 12:59:56 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-06-08 12:59:56 +0200 |
| commit | 59a0620f68e9377001f23f5f491a8b02b520d685 (patch) | |
| tree | 977e12e055ffb34eb671eaa428afd22633cf6d48 /nx-X11/programs/Xserver/hw/nxagent/Display.c | |
| parent | 6208dade860c6429791a5897136506adfd505e9d (diff) | |
| parent | fcc1b57fb980b821138301a9585b91d10bfd0901 (diff) | |
| download | nx-libs-59a0620f68e9377001f23f5f491a8b02b520d685.tar.gz nx-libs-59a0620f68e9377001f23f5f491a8b02b520d685.tar.bz2 nx-libs-59a0620f68e9377001f23f5f491a8b02b520d685.zip | |
Merge branch 'uli42-pr/various7' into 3.6.x
Attributes GH PR #1007: https://github.com/ArcticaProject/nx-libs/pull/1007
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Display.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Display.c | 4 |
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; } |