summaryrefslogtreecommitdiff
path: root/composite
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@tycho.nsa.gov>2007-09-26 07:47:29 -0400
committerEamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil>2007-09-26 07:47:29 -0400
commit27612748e0ec20f3a23839f0a12e39f598dd722c (patch)
treef7780ffd4d1284e76a17166f28211cfb88796de7 /composite
parentb61461425eb15fcff2a58330d74fe5a5a1f226fc (diff)
parent3b114f2603fc2adeec7f5f8f20fe4870afb8dff1 (diff)
Merge branch 'master' into XACE-SELINUX
Conflicts: dix/devices.c
Diffstat (limited to 'composite')
-rw-r--r--composite/compext.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/composite/compext.c b/composite/compext.c
index 2d3bafadb..2918556f8 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -692,6 +692,9 @@ CompositeExtensionInit (void)
ExtensionEntry *extEntry;
int s;
+ /* Assume initialization is going to fail */
+ noCompositeExtension = TRUE;
+
for (s = 0; s < screenInfo.numScreens; s++) {
ScreenPtr pScreen = screenInfo.screens[s];
VisualPtr vis;
@@ -748,4 +751,7 @@ CompositeExtensionInit (void)
return;
miRegisterRedirectBorderClipProc (compSetRedirectBorderClip,
compGetRedirectBorderClip);
+
+ /* Initialization succeeded */
+ noCompositeExtension = FALSE;
}