[fusion-commits] A simple settings manager for CompizConfig: Changes to 'master' (a5352cac544d22b91f12753152d30c09567f6b54)

[marex at server.opencompositing.org]

New commits:
commit a5352cac544d22b91f12753152d30c09567f6b54
Author: Patrick Niklaus <marex at opencompositing.org>
Date:   Fri May 16 21:45:46 2008 +0200

    Always reimport the simple ccsm profiles to avoid corruptions


 simple-ccsm.in |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)


Modified: fusion/compizconfig/simple-ccsm/simple-ccsm.in
===================================================================
--- fusion/compizconfig/simple-ccsm/simple-ccsm.in
+++ fusion/compizconfig/simple-ccsm/simple-ccsm.in
@@ -1007,21 +1007,17 @@ class MainWin:
     def ApplyProfile(self, widget):
         profile = self.ProfileChooser.get_active_text()
 
-        if not profile in self.Context.Profiles.keys():
+        if profile == _("Default"):
+            self.Context.ResetProfile()
+        else:
             profilePath = "%s/profiles/%s.profile" % (DataDir, profile)
             self.Context.CurrentProfile = ccs.Profile(self.Context, profile)
             self.Context.Read()
             self.Context.UpdateProfiles()
             self.Context.Import(profilePath)
-        else:
-            if profile == _("Default"):
-                self.Context.ResetProfile()
-            else:
-                self.Context.UpdateProfiles()
-                self.Context.CurrentProfile = self.Context.Profiles[profile]
 
-        self.Update()
         self.Context.Write()
+        self.Update()
 
     def SetProfile(self):
         SetupBoxModel(self.ProfileChooser)