summaryrefslogtreecommitdiff
path: root/dix
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2008-09-23 10:22:22 -0400
committerAdam Jackson <ajax@redhat.com>2008-09-23 10:22:22 -0400
commit991ed2949ba682684952fe323f8f0f51ebdca98e (patch)
tree2c2e8fa9adaa87e014db79c86b89784082a9fbf7 /dix
parentca9fae00795a114bca4397c32b543d6326a4c547 (diff)
Rename SaveSetMap() to SaveSetShouldMap().
Avoids preprocessor collision with xfixeswire.h
Diffstat (limited to 'dix')
-rw-r--r--dix/window.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/dix/window.c b/dix/window.c
index 32eb801ab..8f6384bb7 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -3028,7 +3028,7 @@ HandleSaveSet(ClientPtr client)
{
#ifdef XFIXES
/* unmap first so that ReparentWindow doesn't remap */
- if (!SaveSetMap (client->saveSet[j]))
+ if (!SaveSetShouldMap (client->saveSet[j]))
UnmapWindow(pWin, FALSE);
#endif
ReparentWindow(pWin, pParent,
@@ -3039,7 +3039,7 @@ HandleSaveSet(ClientPtr client)
pWin->mapped = FALSE;
}
#ifdef XFIXES
- if (SaveSetMap (client->saveSet[j]))
+ if (SaveSetShouldMap (client->saveSet[j]))
#endif
MapWindow(pWin, client);
}