fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-21 02:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

miext/rootless: Fix the usage of DeleteProperty so that this builds again.

Browse source
This commit is contained in:
George Peter Staplin 2008-10-23 16:19:58 -06:00
parent ea8cc7c7c5
commit 3de250e28a
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
miext/rootless/rootlessWindow.c
View file

@ -273,6 +273,12 @@ RootlessGetShape(WindowPtr pWin, RegionPtr pShape)
{ {
ScreenPtr pScreen = pWin->drawable.pScreen; ScreenPtr pScreen = pWin->drawable.pScreen;
/*
* Avoid a warning.
* REGION_NULL and the other macros don't actually seem to use pScreen.
*/
(void)pScreen;
if (wBoundingShape(pWin) == NULL) if (wBoundingShape(pWin) == NULL)
return FALSE; return FALSE;
@ -1606,15 +1612,19 @@ RootlessDisableRoot (ScreenPtr pScreen)
{ {
WindowPtr pRoot; WindowPtr pRoot;
RootlessWindowRec *winRec; RootlessWindowRec *winRec;
pRoot = WindowTable[pScreen->myNum]; pRoot = WindowTable[pScreen->myNum];
winRec = WINREC (pRoot); winRec = WINREC (pRoot);
if (winRec != NULL) if (NULL == winRec)
{ return;
RootlessDestroyFrame (pRoot, winRec);
DeleteProperty (pRoot, xa_native_window_id ()); RootlessDestroyFrame (pRoot, winRec);
} /*
* gstaplin: I fixed the usage of this DeleteProperty so that it would compile.
* QUESTION: Where is this xa_native_window_id set?
*/
DeleteProperty (serverClient, pRoot, xa_native_window_id ());
} }
void void