[orca/gnome-2-30] Fix for bgo#613299 - Orca should not present changes in the active descendant for unfocused widgets

[Joanmarie Diggs <joanied src gnome org>]

commit 9ca3046df6ff11b03a67af1ba2193291954cc496
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Fri Jun 18 10:31:31 2010 -0400

    Fix for bgo#613299 - Orca should not present changes in the active descendant for unfocused widgets in OOo

 src/orca/scripts/apps/soffice/script.py |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/src/orca/scripts/apps/soffice/script.py b/src/orca/scripts/apps/soffice/script.py
index fc4bf9d..8b5e946 100644
--- a/src/orca/scripts/apps/soffice/script.py
+++ b/src/orca/scripts/apps/soffice/script.py
@@ -1933,9 +1933,13 @@ class Script(default.Script):
             # The style list in the Formatting toolbar also lacks state
             # focused.
             #
-            elif event.any_data and self.getAncestor(event.source,
-                                                     [pyatspi.ROLE_TOOL_BAR],
-                                                     [pyatspi.ROLE_FRAME]):
+            elif event.any_data \
+                 and self.getAncestor(event.source,
+                                      [pyatspi.ROLE_TOOL_BAR],
+                                      [pyatspi.ROLE_FRAME]) \
+                 and self.getAncestor(orca_state.locusOfFocus,
+                                      [pyatspi.ROLE_TOOL_BAR],
+                                      [pyatspi.ROLE_FRAME]):
                 handleEvent = True
 
         elif self.isSameObject(orca_state.locusOfFocus, event.source.parent) \