[orca/gnome-2-26] Tweak to the fix for bug 530784.

[Joanmarie Diggs <joanied src gnome org>]

commit 8c72c1d71a4c1fa74f582f243ddb31cbd116b346
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Fri Jun 12 11:44:42 2009 -0400

    Tweak to the fix for bug 530784.
    
    The fix for bug 530784 (whereAmI info for list items in web content
    needs to be improved) introduced a regression in whereAmI for the
    message headers in Thunderbird. This change fixes that regression.

 src/orca/where_am_I.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/orca/where_am_I.py b/src/orca/where_am_I.py
index cacb82e..90fbc83 100644
--- a/src/orca/where_am_I.py
+++ b/src/orca/where_am_I.py
@@ -516,7 +516,8 @@ class WhereAmI:
                                             [pyatspi.ROLE_TABLE_CELL,
                                              pyatspi.ROLE_LIST_ITEM],
                                             [pyatspi.ROLE_FRAME])
-        if ancestor and not self._script.isLayoutOnly(ancestor.parent):
+        if ancestor and not self._script.isLayoutOnly(ancestor.parent) \
+           and obj.getRole() != pyatspi.ROLE_ENTRY:
             # [[[TODO: WDW - we handle ROLE_ENTRY specially here because
             # there is a bug in getRealActiveDescendant: it doesn't dive
             # deep enough into the hierarchy (see comment #12 of bug
@@ -525,8 +526,7 @@ class WhereAmI:
             # getRealActiveDescendant.]]]
             #
             if ancestor.getRole() == pyatspi.ROLE_TABLE_CELL:
-                if obj.getRole() != pyatspi.ROLE_ENTRY:
-                    return self._speakTableCell(ancestor, basicOnly)
+                return self._speakTableCell(ancestor, basicOnly)
             else:
                 return self._speakListItem(ancestor, basicOnly)