From 601233bcc184167e366d07bcb902bc4c321bf77a Mon Sep 17 00:00:00 2001
From: Andreas Hartmetz <ahartmetz@gmail.com>
Date: Fri, 4 Dec 2009 08:31:28 +0000
Subject: [PATCH] Treat CompositingPrefs::enableCompositing() merely as a
 recommendation again like it was before. This makes it possible to enable
 compositing again on my R600 hardware and other hardware that is not
 explicitly known to work. I also think that
 CompositingPrefs::enableCompositing() is a (really) bad name: it's not about
 user preferences and it's not definitive. So what about
 CompositingHardware::isKnownToWork()?.

svn path=/trunk/KDE/kdebase/workspace/; revision=1058198
---
 compositingprefs.h |  2 +-
 options.cpp        | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/compositingprefs.h b/compositingprefs.h
index c0722bb8a2..9378caa966 100644
--- a/compositingprefs.h
+++ b/compositingprefs.h
@@ -54,7 +54,7 @@ public:
     static bool compositingPossible();
     static QString compositingNotPossibleReason();
     bool validateSetup( CompositingType compositingType ) const;
-    bool enableCompositing() const;
+    bool enableCompositing() const; // recommendCompositing()?
     bool enableVSync() const  { return mEnableVSync; }
     bool enableDirectRendering() const  { return mEnableDirectRendering; }
     bool strictBinding() const { return mStrictBinding; }
diff --git a/options.cpp b/options.cpp
index f408aee808..78faf3327d 100644
--- a/options.cpp
+++ b/options.cpp
@@ -58,8 +58,8 @@ Options::~Options()
 unsigned long Options::updateSettings()
     {
     KSharedConfig::Ptr _config = KGlobal::config();
-    unsigned long changed = 0;
-    changed |= KDecorationOptions::updateSettings( _config.data() ); // read decoration settings
+    // read decoration settings
+    const unsigned long changed = KDecorationOptions::updateSettings( _config.data() );
 
     KConfigGroup config( _config, "Windows" );
     moveMode = stringToMoveResizeMode( config.readEntry("MoveMode", "Opaque" ));
@@ -229,12 +229,8 @@ void Options::reloadCompositingSettings()
 
     // Compositing settings
     CompositingPrefs prefs;
-    useCompositing = config.readEntry("Enabled", true);
-    if (useCompositing)
-    {
-        prefs.detect();
-        useCompositing = prefs.enableCompositing();
-    }
+    prefs.detect();
+    useCompositing = config.readEntry("Enabled", prefs.enableCompositing());
     if (!useCompositing)
         return;