[orca/new-settings] Update the information in N backends.



commit 138077bc9241a5e680a446aab7f5401b277f9bf6
Author: Alejandro Leiva <aleiva emergya es>
Date:   Fri Oct 29 13:07:09 2010 +0200

    Update the information in N backends.

 src/orca/backends/yaml_backend.py |    5 +++--
 src/orca/settings_manager.py      |    2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/src/orca/backends/yaml_backend.py b/src/orca/backends/yaml_backend.py
index 82e8e24..a510355 100644
--- a/src/orca/backends/yaml_backend.py
+++ b/src/orca/backends/yaml_backend.py
@@ -80,8 +80,9 @@ class Backend:
         profilePrefs.update(newProfilePrefs)
 
         for profilePrefsKey, profilePrefsValue in profilePrefs.items():
-            old = (newProfilePrefs.get(profilePrefsKey, dict()))
-            profilePrefsValue.update(self.profiles.get(profilePrefsKey, dict()))
+            profiles = self.profiles.get(profilePrefsKey, dict())
+            profiles.update(profilePrefsValue)
+            profilePrefsValue = profiles.copy()
 
         currentProfile = profilePrefs.get(profile)
         currentProfile['pronunciations'] = pronunciations
diff --git a/src/orca/settings_manager.py b/src/orca/settings_manager.py
index cca483e..5faa0bf 100644
--- a/src/orca/settings_manager.py
+++ b/src/orca/settings_manager.py
@@ -287,6 +287,8 @@ class SettingsManager():
                 continue
             elif value != self.defaultGeneralValues[key]:
                 self.profileGeneral[key] = value
+            elif self.general.get(key) != value:
+                self.profileGeneral[key] = value
 
     def _setProfilePronunciations(self, pronunciations):
         """Set the changed pronunciations settings from the defaults' ones



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]