diff options
author | marha <marha@users.sourceforge.net> | 2010-09-11 09:26:35 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-09-11 09:26:35 +0000 |
commit | 35b29c19707341bbfa32f7f6136ce09e59cb332c (patch) | |
tree | a795242657a2b96a463a11774517472fa4c64953 /xorg-server/dix/property.c | |
parent | ba6498fea6d935aff0856f9851cb47d5657952fa (diff) | |
parent | e172c89783326e2378e4793ff31a0f44210c5534 (diff) | |
download | vcxsrv-35b29c19707341bbfa32f7f6136ce09e59cb332c.tar.gz vcxsrv-35b29c19707341bbfa32f7f6136ce09e59cb332c.tar.bz2 vcxsrv-35b29c19707341bbfa32f7f6136ce09e59cb332c.zip |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/dix/property.c')
-rw-r--r-- | xorg-server/dix/property.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/xorg-server/dix/property.c b/xorg-server/dix/property.c index 9d30e726d..2ba3f4419 100644 --- a/xorg-server/dix/property.c +++ b/xorg-server/dix/property.c @@ -284,7 +284,6 @@ dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property, pProp->format = format;
pProp->data = data;
pProp->size = len;
- pProp->devPrivates = NULL;
rc = XaceHookPropertyAccess(pClient, pWin, &pProp,
DixCreateAccess|DixWriteAccess);
if (rc != Success) {
|