From feaaab26cb0f4c4158f2a8275347e847074a9818 Mon Sep 17 00:00:00 2001
From: Lucas Murray <lmurray@undefinedfire.com>
Date: Fri, 26 Jun 2009 08:38:23 +0000
Subject: [PATCH] Backport r987507: Be more strict in KWIN_COMPOSE handling.

svn path=/branches/KDE/4.3/kdebase/workspace/; revision=987508
---
 composite.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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