orca r3989 - in trunk: . src/orca

[richb svn gnome org]

Author: richb
Date: Wed Jun 18 19:54:30 2008
New Revision: 3989
URL: http://svn.gnome.org/viewvc/orca?rev=3989&view=rev

Log:
        * src/orca/speechgenerator.py:
          Fixed bug #538058 - The role for accessibles of ROLE_LIST_ITEM 
          should not be spoken when the accessible is given focus.


Modified:
   trunk/ChangeLog
   trunk/src/orca/speechgenerator.py

Modified: trunk/src/orca/speechgenerator.py
==============================================================================
--- trunk/src/orca/speechgenerator.py	(original)
+++ trunk/src/orca/speechgenerator.py	Wed Jun 18 19:54:30 2008
@@ -92,6 +92,8 @@
              self._getSpeechForLayeredPane
         self.speechGenerators[pyatspi.ROLE_LIST]                = \
              self._getSpeechForList
+        self.speechGenerators[pyatspi.ROLE_LIST_ITEM]           = \
+             self._getSpeechForListItem
         self.speechGenerators[pyatspi.ROLE_MENU]                = \
              self._getSpeechForMenu
         self.speechGenerators[pyatspi.ROLE_MENU_BAR]            = \
@@ -806,7 +808,16 @@
         Returns a list of utterances to be spoken for the object.
         """
 
-        utterances = self._getDefaultSpeech(obj, already_focused)
+        utterances = []
+ 
+        if not already_focused:
+            label = self._getSpeechForObjectLabel(obj)
+            utterances.extend(label)
+            name = self._getSpeechForObjectName(obj)
+            if name != label:
+                utterances.extend(name)
+            utterances.extend(self._getSpeechForAllTextSelection(obj))
+        utterances.extend(self._getSpeechForObjectAvailability(obj))
 
         # If already in focus then the tree probably collapsed or expanded
         state = obj.getState()