[orca/new-settings] Back to previous state.

[Alejandro Leiva <aleiva src gnome org>]

commit d3cb40a25262b852fb3ac099f2d67d17f9d291d5
Author: Alejandro Leiva <aleiva emergya es>
Date:   Fri Oct 29 11:50:57 2010 +0200

    Back to previous state.

 src/orca/backends/yaml_backend.py |    3 ---
 src/orca/settings_manager.py      |    7 +------
 2 files changed, 1 insertions(+), 9 deletions(-)
---
diff --git a/src/orca/backends/yaml_backend.py b/src/orca/backends/yaml_backend.py
index 00a3602..82e8e24 100644
--- a/src/orca/backends/yaml_backend.py
+++ b/src/orca/backends/yaml_backend.py
@@ -46,9 +46,6 @@ class Backend:
     def saveDefaultSettings(self, general, pronunciations, keybindings):
         """ Save default settings for all the properties from
             orca.settings. """
-        if not self.isFirstStart():
-            return
-
         prefs = {'general': general,
                  'profiles': { 'default': { 'profile': ['Default', 'default'],
                                             'pronunciations': {},
diff --git a/src/orca/settings_manager.py b/src/orca/settings_manager.py
index c8c7d73..cca483e 100644
--- a/src/orca/settings_manager.py
+++ b/src/orca/settings_manager.py
@@ -281,16 +281,11 @@ class SettingsManager():
     def _setProfileGeneral(self, general):
         """Set the changed general settings from the defaults' ones
         as the profile's."""
-        activeGeneral = self.getGeneralSettings()
         self.profileGeneral = {}
-        isSameProfile = activeGeneral.get('profile') == general.get('profile')
         for key, value in general.items():
             if key in ['pronunciations', 'keybindings']:
                 continue
-            if not isSameProfile:
-                if value != self.defaultGeneralValues.get(key):
-                    self.profileGeneral[key] = value
-            elif value != activeGeneral.get(key):
+            elif value != self.defaultGeneralValues[key]:
                 self.profileGeneral[key] = value
 
     def _setProfilePronunciations(self, pronunciations):