diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2018-02-26 05:03:53 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2018-02-26 05:09:50 +0100 |
| commit | 1b54f6462bd8c0ec5eda2007794bbd76f73f6df2 (patch) | |
| tree | 6720ab763da627b5b36f4759896cf1d17ff7ec64 /nx-X11/programs/Xserver/hw/nxagent/NXproperty.c | |
| parent | 485d626769c53c7d72ffad2f4e8623d6ce897662 (diff) | |
| download | nx-libs-1b54f6462bd8c0ec5eda2007794bbd76f73f6df2.tar.gz nx-libs-1b54f6462bd8c0ec5eda2007794bbd76f73f6df2.tar.bz2 nx-libs-1b54f6462bd8c0ec5eda2007794bbd76f73f6df2.zip | |
Lift dix to xorg-xserver-1.3.0.0 state - non-functional changes only
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/NXproperty.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/NXproperty.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c index 4482c29a6..6292b3508 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c @@ -275,7 +275,7 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format, { if (totalSize != pProp->size * (pProp->format >> 3)) { - data = (void *)realloc(pProp->data, totalSize); + data = (void *)realloc(pProp->data, totalSize); if (!data && len) return(BadAlloc); pProp->data = data; @@ -349,7 +349,6 @@ ProcGetProperty(ClientPtr client) REQUEST(xGetPropertyReq); REQUEST_SIZE_MATCH(xGetPropertyReq); - if (stuff->delete) UpdateCurrentTime(); pWin = (WindowPtr)SecurityLookupWindow(stuff->window, client, |