[orca] Additional fix for bug 543157 - It is not always possible to distinguish on-screen text from Orca's

[Joanmarie Diggs <joanied src gnome org>]

commit 0db7e4aba51ef3c9e7950bcd2b0536bbbcd28c0b
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Mon Aug 16 16:25:24 2010 -0400

    Additional fix for bug 543157 - It is not always possible to distinguish on-screen text from Orca's "system" messages
    
    This change causes us to speak the 'settings reloaded' message in
    the correct voice. Also causes us to speak the 'welcome' message
    in the more correct voice (i.e. including rate, etc.). It may
    solve other issues due to the nature and location of the fix.

 src/orca/orca.py   |    3 ++-
 src/orca/speech.py |    4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/src/orca/orca.py b/src/orca/orca.py
index c882140..8a44ce3 100644
--- a/src/orca/orca.py
+++ b/src/orca/orca.py
@@ -1152,7 +1152,8 @@ def loadUserSettings(script=None, inputEvent=None):
                 # preferences.  This is a spoken prompt to let the user
                 # know when the preferences has been reloaded.
                 #
-                speech.speak(_("Orca user settings reloaded."))
+                msg = _("Orca user settings reloaded.")
+                speech.speak(msg, settings.voices.get(settings.SYSTEM_VOICE))
             debug.println(debug.LEVEL_CONFIGURATION,
                           "Speech module has been initialized.")
         except:
diff --git a/src/orca/speech.py b/src/orca/speech.py
index 1d0c28b..aba2b5f 100644
--- a/src/orca/speech.py
+++ b/src/orca/speech.py
@@ -182,7 +182,9 @@ def _speak(text, acss, interrupt):
     log.info(logLine + extraDebug)
 
     if _speechserver:
-        _speechserver.speak(text, __resolveACSS(acss), interrupt)
+        voice = ACSS(settings.voices.get(settings.DEFAULT_VOICE))
+        voice.update(acss)
+        _speechserver.speak(text, __resolveACSS(voice), interrupt)
 
 def speak(content, acss=None, interrupt=True):
     """Speaks the given content.  The content can be either a simple