[orca/570658] Don't ever speak a role of 'unknown'

[William Walker <wwalker src gnome org>]

commit 3450b7e367d60c2973e6353b454b087898f4e29a
Author: Willie Walker <william walker sun com>
Date:   Fri May 22 16:15:04 2009 -0400

    Don't ever speak a role of 'unknown'
---
 .../scripts/toolkits/Gecko/speech_generator.py     |    4 +++-
 src/orca/scripts/toolkits/Gecko/where_am_i.py      |    3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/orca/scripts/toolkits/Gecko/speech_generator.py b/src/orca/scripts/toolkits/Gecko/speech_generator.py
index f0aa590..13d92db 100644
--- a/src/orca/scripts/toolkits/Gecko/speech_generator.py
+++ b/src/orca/scripts/toolkits/Gecko/speech_generator.py
@@ -194,7 +194,9 @@ class SpeechGenerator(speechgenerator.SpeechGenerator):
                           pyatspi.ROLE_SECTION,
                           pyatspi.ROLE_UNKNOWN]
         else:
-            doNotSpeak = []
+            # We never ever want to speak 'unknown'
+            #
+            doNotSpeak = [pyatspi.ROLE_UNKNOWN]
 
         if not force and self._script.inDocumentContent(obj):
             doNotSpeak.append(pyatspi.ROLE_TABLE_CELL)
diff --git a/src/orca/scripts/toolkits/Gecko/where_am_i.py b/src/orca/scripts/toolkits/Gecko/where_am_i.py
index d473d2b..67f148d 100644
--- a/src/orca/scripts/toolkits/Gecko/where_am_i.py
+++ b/src/orca/scripts/toolkits/Gecko/where_am_i.py
@@ -102,7 +102,8 @@ class GeckoWhereAmI(where_am_I.WhereAmI):
                                     pyatspi.ROLE_SECTION,
                                     pyatspi.ROLE_TABLE_CELL]:
             role = objRole
-        args['role'] = role
+        if role:
+            args['role'] = role
         return where_am_I.WhereAmI._getSpeechForRoleName(self, obj, **args)
 
     def _speakObjDescription(self, obj):