[orca] Fix for bug#627691 - When I say all a webpage content and Orca attempts to speak an image descriptio

[Joanmarie Diggs <joanied src gnome org>]

commit 37aa48f10eaa5869cbbe28f2c6a0e8332f845ee9
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Tue Aug 24 14:41:47 2010 -0400

    Fix for bug#627691 - When I say all a webpage content and Orca attempts to speak an image description, the say all operation is terminated

 src/orca/scripts/toolkits/Gecko/script.py |    4 ++--
 src/orca/speechdispatcherfactory.py       |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/src/orca/scripts/toolkits/Gecko/script.py b/src/orca/scripts/toolkits/Gecko/script.py
index 3444d9d..8489db0 100644
--- a/src/orca/scripts/toolkits/Gecko/script.py
+++ b/src/orca/scripts/toolkits/Gecko/script.py
@@ -5294,9 +5294,9 @@ class Script(default.Script):
                 utterance = self.speechGenerator.generateSpeech(obj)
             else:
                 utterance = [string]
+                utterance.append(self.voices.get(settings.DEFAULT_VOICE))
                 if speakRole and not role in doNotSpeakRoles:
-                    utterance.extend(\
-                        self.speechGenerator.getRoleName(obj))
+                    utterance.extend(self.speechGenerator.getRoleName(obj))
   
             # If the object is a heading, or is contained within a heading,
             # speak that role information at the end of the object.
diff --git a/src/orca/speechdispatcherfactory.py b/src/orca/speechdispatcherfactory.py
index 06a0995..ef53afb 100644
--- a/src/orca/speechdispatcherfactory.py
+++ b/src/orca/speechdispatcherfactory.py
@@ -310,6 +310,8 @@ class SpeechServer(speechserver.SpeechServer):
         return newText.encode("UTF-8")
 
     def _speak(self, text, acss, **kwargs):
+        if not isinstance(text, str):
+            text = ''
         text = self.__addVerbalizedPunctuation(text)
         # Replace no break space characters with plain spaces since some
         # synthesizers cannot handle them.  See bug #591734.