diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-07-31 01:48:27 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-07-31 01:48:27 +0000 |
| commit | 326729ebca863c99cf913445126294a3c6d3db5d (patch) | |
| tree | debc40061f959b1d017c7d20df3922a568a3e081 /dix/dispatch.c | |
| parent | 370bda820b2912b93dcc34c088075f8e65a9e5cb (diff) | |
- Add some XFIXES bits apparently missed in the DAMAGE-XFIXES merge
- Add missing XCSECURITY ifdef.
- Sync some whitespace to xserver CVS and surrounding style.
Diffstat (limited to 'dix/dispatch.c')
| -rw-r--r-- | dix/dispatch.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/dix/dispatch.c b/dix/dispatch.c index fca0de709..08d523441 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.3 2004/06/21 13:40:25 ago Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.4 2004/07/29 18:43:58 stukreit Exp $ */ /* $Xorg: dispatch.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */ /************************************************************ @@ -1050,13 +1050,12 @@ ProcSetSelectionOwner(client) CurrentSelections[i].client = (pWin ? client : NullClient); if (SelectionCallback) { - SelectionInfoRec info; + SelectionInfoRec info; - info.selection = &CurrentSelections[i]; - info.kind= SelectionSetOwner; - CallCallbacks(&SelectionCallback, &info); + info.selection = &CurrentSelections[i]; + info.kind= SelectionSetOwner; + CallCallbacks(&SelectionCallback, &info); } - return (client->noClientException); } else @@ -2130,7 +2129,9 @@ DoGetImage(client, format, drawable, x, y, width, height, planemask, im_return) Mask plane = 0; char *pBuf; xGetImageReply xgi; +#ifdef XCSECURITY RegionPtr pVisibleRegion = NULL; +#endif if ((format != XYPixmap) && (format != ZPixmap)) { |