orca r4440 - in trunk: . src/orca/scripts/apps/evolution

[joanied svn gnome org]

Author: joanied
Date: Tue Jan 20 22:06:12 2009
New Revision: 4440
URL: http://svn.gnome.org/viewvc/orca?rev=4440&view=rev

Log:
* src/orca/scripts/apps/evolution/script.py:
  Rest of the fix for bug #567428 -"readonly text" spoken when
  caret changes line.


Modified:
   trunk/ChangeLog
   trunk/src/orca/scripts/apps/evolution/script.py

Modified: trunk/src/orca/scripts/apps/evolution/script.py
==============================================================================
--- trunk/src/orca/scripts/apps/evolution/script.py	(original)
+++ trunk/src/orca/scripts/apps/evolution/script.py	Tue Jan 20 22:06:12 2009
@@ -522,10 +522,17 @@
 
         try:
             obj.queryHypertext()
+            ancestor = obj.parent.parent
         except:
             return False
         else:
-            return obj.getState().contains(pyatspi.STATE_MULTI_LINE)
+            # The accessible text objects in the header at the top
+            # of the message also have STATE_MULTI_LINE. But they
+            # are inside panels which are inside table cells; the
+            # body text is not. See bug #567428.
+            #
+            return (obj.getState().contains(pyatspi.STATE_MULTI_LINE) \
+                    and ancestor.getRole() != pyatspi.ROLE_TABLE_CELL)
 
     def presentMessageLine(self, obj, newLocusOfFocus):
         """Speak/braille the line at the current text caret offset.