diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-06 00:53:06 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-06 00:53:06 +0100 |
commit | 67599026d01692c52276df6ff5e8332d2413c18f (patch) | |
tree | b93b8d6643dd6438f0844d48008d6cb9ffee405f /nx-X11/programs/Xserver/dix/property.c | |
parent | 5a8f1e921b4cafedc9efac22d5fbd2ce05e45ba9 (diff) | |
parent | cf8797c3c0e9623e5092a2c9f5ea7cb31bc11657 (diff) | |
download | nx-libs-67599026d01692c52276df6ff5e8332d2413c18f.tar.gz nx-libs-67599026d01692c52276df6ff5e8332d2413c18f.tar.bz2 nx-libs-67599026d01692c52276df6ff5e8332d2413c18f.zip |
Merge branch 'uli42-pr/various3' into 3.6.x
Attributes GH PR #880: https://github.com/ArcticaProject/nx-libs/pull/880
Diffstat (limited to 'nx-X11/programs/Xserver/dix/property.c')
-rw-r--r-- | nx-X11/programs/Xserver/dix/property.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/dix/property.c b/nx-X11/programs/Xserver/dix/property.c index 7f25a5c55..f46b53f7c 100644 --- a/nx-X11/programs/Xserver/dix/property.c +++ b/nx-X11/programs/Xserver/dix/property.c @@ -253,11 +253,18 @@ ProcChangeProperty(ClientPtr client) else return client->noClientException; } +#endif /* NXAGENT_SERVER */ int +#ifdef NXAGENT_SERVER +Xorg_ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format, + int mode, unsigned long len, void * value, + Bool sendevent) +#else ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format, int mode, unsigned long len, void * value, Bool sendevent) +#endif { PropertyPtr pProp; int sizeInBytes; @@ -367,7 +374,6 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format, } return(Success); } -#endif /* NXAGENT_SERVER */ int DeleteProperty(WindowPtr pWin, Atom propName) |