[orca/orca-gnome3: 79/87] Fix for the problem of voice settings not getting properly loaded or unloaded when the application s

[Alejandro Leiva <aleiva src gnome org>]

commit 8ae320881fa9a185a8af94b96ec4e8ca94bdc836
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Fri Mar 25 09:38:52 2011 -0400

    Fix for the problem of voice settings not getting properly loaded or unloaded when the application script changes.
    
    (No bug filed because bugzilla is down and it's code freeze day.)

 src/orca/settings_manager.py |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/src/orca/settings_manager.py b/src/orca/settings_manager.py
index bee72ef..909e912 100644
--- a/src/orca/settings_manager.py
+++ b/src/orca/settings_manager.py
@@ -527,6 +527,7 @@ class SettingsManager(object):
         """
 
         self._loadProfileSettings()
+        script.voices = self.getSetting('voices')
 
         import orca
         _scriptManager = getattr(orca, '_scriptManager')
@@ -561,6 +562,10 @@ class SettingsManager(object):
         self._knownAppSettings[name] = module
         reload(self._knownAppSettings[name])
 
+        appVoices = self.getSetting('voices')
+        for voiceType, voiceDef in appVoices.items():
+            script.voices[voiceType].update(voiceDef)
+
         keybindings = getattr(module, 'overrideAppKeyBindings', None)
         if keybindings:
             script.overrideAppKeyBindings = keybindings