aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/dix
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-05-01 14:10:17 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-11-02 11:39:30 +0100
commit7675af8e1323925badd313adf3ec8333984d7ee1 (patch)
tree75a0ce4167c351512b1226cefc5630297f1b4384 /nx-X11/programs/Xserver/dix
parentcf0571bb49b255cb8056da1ea5f6d41e37eb834c (diff)
downloadnx-libs-7675af8e1323925badd313adf3ec8333984d7ee1.tar.gz
nx-libs-7675af8e1323925badd313adf3ec8333984d7ee1.tar.bz2
nx-libs-7675af8e1323925badd313adf3ec8333984d7ee1.zip
NXwindow.c: use upstream function DeleteWindow()
DeleteWindow() is calling FreeWindowResources() which is calling DisposeWindowOptional() which sets pWin->optional to NULL. So the now removed code was never called. After removal DeleteWindow() is identical to the dix version, so we use that one.
Diffstat (limited to 'nx-X11/programs/Xserver/dix')
-rw-r--r--nx-X11/programs/Xserver/dix/window.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/dix/window.c b/nx-X11/programs/Xserver/dix/window.c
index 04e0a2d05..d294e139d 100644
--- a/nx-X11/programs/Xserver/dix/window.c
+++ b/nx-X11/programs/Xserver/dix/window.c
@@ -915,7 +915,6 @@ CrushTree(WindowPtr pWin)
* If wid is None, don't send any events
*****/
-#ifndef NXAGENT_SERVER
int
DeleteWindow(void * value, XID wid)
{
@@ -951,7 +950,6 @@ DeleteWindow(void * value, XID wid)
free(pWin);
return Success;
}
-#endif /* NXAGENT_SERVER */
void
DestroySubwindows(register WindowPtr pWin, ClientPtr client)