yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revertlast, will be fixed properly. Next time when you decide to revert

Browse source 
something, please at least look at the commit you're reverting - this is
obviously broken too.
CCMAIL: Andreas Hartmetz <ahartmetz@gmail.com>


svn path=/trunk/KDE/kdebase/workspace/; revision=1058203
This commit is contained in:
Luboš Luňák 2009-12-04 08:50:13 +00:00
parent 601233bcc1
commit 868e08f380
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
options.cpp
View file

@ -58,8 +58,8 @@ Options::~Options()
unsigned long Options::updateSettings() unsigned long Options::updateSettings()
{ {
KSharedConfig::Ptr _config = KGlobal::config(); KSharedConfig::Ptr _config = KGlobal::config();
// read decoration settings unsigned long changed = 0;
const unsigned long changed = KDecorationOptions::updateSettings( _config.data() ); changed |= KDecorationOptions::updateSettings( _config.data() ); // read decoration settings
KConfigGroup config( _config, "Windows" ); KConfigGroup config( _config, "Windows" );
moveMode = stringToMoveResizeMode( config.readEntry("MoveMode", "Opaque" )); moveMode = stringToMoveResizeMode( config.readEntry("MoveMode", "Opaque" ));
@ -229,8 +229,12 @@ void Options::reloadCompositingSettings()
// Compositing settings // Compositing settings
CompositingPrefs prefs; CompositingPrefs prefs;
prefs.detect(); useCompositing = config.readEntry("Enabled", true);
useCompositing = config.readEntry("Enabled", prefs.enableCompositing()); if (useCompositing)
{
prefs.detect();
useCompositing = prefs.enableCompositing();
}
if (!useCompositing) if (!useCompositing)
return; return;