frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

(cherry picked from commit 3de250e28a9a86bcae4464a15c2025805877ce1e)
This commit is contained in:
George Peter Staplin 2008-10-23 16:19:58 -06:00 committed by Jeremy Huddleston
parent 28d4f71193
commit b397cc7277
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

@ -272,6 +272,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;
@ -1598,15 +1604,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