From 433bea20034f3d8fae4cc785050dd2d49c830ede Mon Sep 17 00:00:00 2001
From: Lucas Murray <lmurray@undefinedfire.com>
Date: Wed, 17 Dec 2008 03:10:51 +0000
Subject: [PATCH] Load and save electric borders separately from the general
 settings. Fixes bug preventing users from changing active screen edges. BUG:
 176900

svn path=/trunk/KDE/kdebase/workspace/; revision=897888
---
 kcmkwin/kwincompositing/main.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/kcmkwin/kwincompositing/main.cpp b/kcmkwin/kwincompositing/main.cpp
index 4ddacb409d..25b401907f 100644
--- a/kcmkwin/kwincompositing/main.cpp
+++ b/kcmkwin/kwincompositing/main.cpp
@@ -335,8 +335,6 @@ void KWinCompositingConfig::loadGeneralTab()
     KConfigGroup cubeconfig(mKWinConfig, "Effect-Cube");
     if( effectEnabled( "cube", effectconfig ) && cubeconfig.readEntry("AnimateDesktopChange", false))
         ui.desktopSwitchingCombo->setCurrentIndex( 2 );
-
-    loadElectricBorders();
     }
 
 bool KWinCompositingConfig::effectEnabled( const QString& effect, const KConfigGroup& cfg ) const
@@ -391,6 +389,7 @@ void KWinCompositingConfig::load()
         tmpconfig.writeEntry(it.key(), it.value());
 
     loadGeneralTab();
+    loadElectricBorders();
     loadEffectsTab();
     loadAdvancedTab();
 
@@ -484,8 +483,6 @@ void KWinCompositingConfig::saveGeneralTab()
         }
     KConfigGroup cubeconfig(mKWinConfig, "Effect-Cube");
     cubeconfig.writeEntry("AnimateDesktopChange", cubeDesktopSwitching);
-
-    saveElectricBorders();
     }
 
 void KWinCompositingConfig::saveEffectsTab()
@@ -551,6 +548,7 @@ void KWinCompositingConfig::save()
         loadGeneralTab();
         saveGeneralTab();
         }
+    saveElectricBorders();
     bool advancedChanged = saveAdvancedTab();
 
     // Copy Plugins group from temp config to real config