[orca] Fix for Orca reverting to the default voice settings for applications



commit de15823012a3fed2cb365210220399a616cc9492
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Sun Feb 24 18:02:02 2013 -0500

    Fix for Orca reverting to the default voice settings for applications

 src/orca/settings_manager.py |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/src/orca/settings_manager.py b/src/orca/settings_manager.py
index cf3b045..0f5592f 100644
--- a/src/orca/settings_manager.py
+++ b/src/orca/settings_manager.py
@@ -112,7 +112,6 @@ class SettingsManager(object):
 
         # For handling the currently-"classic" application settings
         self.settingsPackages = ["app-settings"]
-        self._knownAppSettings = {}
 
         debug.println(debug.LEVEL_FINEST, 'INFO: Settings manager initialized')
 
@@ -561,12 +560,12 @@ class SettingsManager(object):
         if not module:
             return
 
-        self._knownAppSettings[name] = module
-        imp.reload(self._knownAppSettings[name])
-
-        appVoices = self.getSetting('voices')
-        for voiceType, voiceDef in list(appVoices.items()):
-            script.voices[voiceType].update(voiceDef)
+        if self.profile == 'default':
+            appVoices = self.getSetting('voices')
+            for voiceType, voiceDef in list(appVoices.items()):
+                script.voices[voiceType].update(voiceDef)
+        else:
+            self.setSetting('voices', script.voices)
 
         keybindings = getattr(module, 'overrideAppKeyBindings', None)
         if keybindings:


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