Backport r987507:

Be more strict in KWIN_COMPOSE handling.

svn path=/branches/KDE/4.3/kdebase/workspace/; revision=987508
This commit is contained in:
Lucas Murray 2009-06-26 08:38:23 +00:00
parent d3bb688f86
commit feaaab26cb

View file

@ -115,13 +115,15 @@ void Workspace::setupCompositing()
kDebug( 1212 ) << "Compositing forced to XRender mode by environment variable"; kDebug( 1212 ) << "Compositing forced to XRender mode by environment variable";
type = XRenderCompositing; type = XRenderCompositing;
break; break;
default: case 'N':
if( getenv( "KDE_FAILSAFE" )) if( getenv( "KDE_FAILSAFE" ))
kDebug( 1212 ) << "Compositing disabled forcefully by KDE failsafe mode"; kDebug( 1212 ) << "Compositing disabled forcefully by KDE failsafe mode";
else else
kDebug( 1212 ) << "Compositing disabled forcefully by environment variable"; kDebug( 1212 ) << "Compositing disabled forcefully by environment variable";
type = NoCompositing; return; // Return not break
return; default:
kDebug( 1212 ) << "Unknown KWIN_COMPOSE mode set, ignoring";
break;
} }
} }