diff options
author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/xfixes/saveset.c | |
parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/xfixes/saveset.c')
-rw-r--r-- | xorg-server/xfixes/saveset.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/xfixes/saveset.c b/xorg-server/xfixes/saveset.c index 31664ab65..29de0d8f2 100644 --- a/xorg-server/xfixes/saveset.c +++ b/xorg-server/xfixes/saveset.c @@ -29,7 +29,7 @@ int ProcXFixesChangeSaveSet(ClientPtr client) { - Bool toRoot, remap; + Bool toRoot, map; int result; WindowPtr pWin; REQUEST(xXFixesChangeSaveSetReq); @@ -56,8 +56,8 @@ ProcXFixesChangeSaveSet(ClientPtr client) return( BadValue ); } toRoot = (stuff->target == SaveSetRoot); - remap = (stuff->map == SaveSetMap); - result = AlterSaveSetForClient(client, pWin, stuff->mode, toRoot, remap); + map = (stuff->map == SaveSetMap); + result = AlterSaveSetForClient(client, pWin, stuff->mode, toRoot, map); if (client->noClientException != Success) return(client->noClientException); else |