[orca] Improved support for presenting GtkListBox

[Joanmarie Diggs <joanied src gnome org>]

commit 9790d71abbcdc00a1fc83fe8a5a4722a852f742a
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Tue Sep 10 08:42:31 2013 -0400

    Improved support for presenting GtkListBox

 src/orca/braille_generator.py |    2 +-
 src/orca/script_utilities.py  |    2 +-
 src/orca/speech_generator.py  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/orca/braille_generator.py b/src/orca/braille_generator.py
index adf5e16..76df4d7 100644
--- a/src/orca/braille_generator.py
+++ b/src/orca/braille_generator.py
@@ -138,7 +138,7 @@ class BrailleGenerator(generator.Generator):
 
         # egg-list-box, e.g. privacy panel in gnome-control-center
         if obj.parent and obj.parent.getRole() == pyatspi.ROLE_LIST_BOX:
-            doNotPresent.append(pyatspi.ROLE_FILLER)
+            doNotPresent.append(obj.getRole())
 
         if verbosityLevel == settings.VERBOSITY_LEVEL_BRIEF:
             doNotPresent.extend([pyatspi.ROLE_ICON, pyatspi.ROLE_CANVAS])
diff --git a/src/orca/script_utilities.py b/src/orca/script_utilities.py
index f74c0fc..7559dfb 100644
--- a/src/orca/script_utilities.py
+++ b/src/orca/script_utilities.py
@@ -608,7 +608,7 @@ class Utilities:
                 pass
 
         # egg-list-box, e.g. privacy panel in gnome-control-center
-        if not displayedText and role == pyatspi.ROLE_FILLER:
+        if not displayedText and obj.parent.getRole() == pyatspi.ROLE_LIST_BOX:
             labels = self.unrelatedLabels(obj, onlyShowing=False)
             displayedText = " ".join(map(self.displayedText, labels))
 
diff --git a/src/orca/speech_generator.py b/src/orca/speech_generator.py
index f3525d0..720b1be 100644
--- a/src/orca/speech_generator.py
+++ b/src/orca/speech_generator.py
@@ -261,7 +261,7 @@ class SpeechGenerator(generator.Generator):
 
         # egg-list-box, e.g. privacy panel in gnome-control-center
         if obj.parent and obj.parent.getRole() == pyatspi.ROLE_LIST_BOX:
-            doNotPresent.append(pyatspi.ROLE_FILLER)
+            doNotPresent.append(obj.getRole())
 
         if _settingsManager.getSetting('speechVerbosityLevel') \
                 == settings.VERBOSITY_LEVEL_BRIEF: