[orca/gnome-3-20] Eliminate another instance of double presenting an inferred label

[Joanmarie Diggs <joanied src gnome org>]

commit 9197b3a7b2e6d06b9cd54fa52feea368a08ae6df
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Sun May 8 15:10:28 2016 -0400

    Eliminate another instance of double presenting an inferred label

 src/orca/scripts/web/braille_generator.py |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/src/orca/scripts/web/braille_generator.py b/src/orca/scripts/web/braille_generator.py
index 8d65925..c1c54b5 100644
--- a/src/orca/scripts/web/braille_generator.py
+++ b/src/orca/scripts/web/braille_generator.py
@@ -117,6 +117,16 @@ class BrailleGenerator(braille_generator.BrailleGenerator):
 
         return super()._generateLabel(obj, **args)
 
+    def _generateLabelAndName(self, obj, **args):
+        if self._script.utilities.isTextBlockElement(obj):
+            return []
+
+        role = args.get('role', obj.getRole())
+        if role == pyatspi.ROLE_LABEL and 'Text' in pyatspi.listInterfaces(obj):
+            return []
+
+        return super()._generateLabelAndName(obj, **args)
+
     def _generateExpandedEOCs(self, obj, **args):
         """Returns the expanded embedded object characters for an object."""
         result = []