[orca/gnome-3-12] Eliminate some chattiness presenting combo boxes

[Joanmarie Diggs <joanied src gnome org>]

commit dbfa06e8898400c59cded9f079cc3730c2c38a1d
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Mon Mar 24 14:04:36 2014 -0400

    Eliminate some chattiness presenting combo boxes

 src/orca/speech_generator.py |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/src/orca/speech_generator.py b/src/orca/speech_generator.py
index d4efd3c..01d29ca 100644
--- a/src/orca/speech_generator.py
+++ b/src/orca/speech_generator.py
@@ -1523,8 +1523,13 @@ class SpeechGenerator(generator.Generator):
         with focus.
         """
         result = []
+        priorObj = args.get('priorObj')
+        if obj.getRole() == pyatspi.ROLE_MENU_ITEM \
+           and (not priorObj or priorObj.getRole() == pyatspi.ROLE_WINDOW):
+            return result
+
         topLevelObj = self._script.utilities.topLevelObject(obj)
-        if args.get('priorObj') \
+        if priorObj \
            or (topLevelObj and topLevelObj.getRole() == pyatspi.ROLE_DIALOG):
             result = self._generateAncestors(obj, **args)
         return result