[orca] Revert "Give default speech generator smarts to generate child count for listboxes"

[Joanmarie Diggs <joanied src gnome org>]

commit a501fdac95b0dc7f57e398033e97296a0b4c6ceb
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Thu May 28 20:35:56 2015 -0400

    Revert "Give default speech generator smarts to generate child count for listboxes"
    
    This reverts commit b65315cb45a9921054175c71a24e11344695e850.

 .../scripts/toolkits/Gecko/speech_generator.py     |   13 +++++++++++++
 src/orca/speech_generator.py                       |    8 +-------
 2 files changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/src/orca/scripts/toolkits/Gecko/speech_generator.py 
b/src/orca/scripts/toolkits/Gecko/speech_generator.py
index 9321825..7bebe5c 100644
--- a/src/orca/scripts/toolkits/Gecko/speech_generator.py
+++ b/src/orca/scripts/toolkits/Gecko/speech_generator.py
@@ -159,6 +159,19 @@ class SpeechGenerator(speech_generator.SpeechGenerator):
         # out some of the noise....
         return []
 
+    def _generateNumberOfChildren(self, obj, **args):
+        if _settingsManager.getSetting('onlySpeakDisplayedText'):
+            return []
+
+        role = args.get('role', obj.getRole())
+        if role not in [pyatspi.ROLE_LIST, pyatspi.ROLE_LIST_BOX] \
+           or not self._script.utilities.inDocumentContent(obj):
+            return super()._generateNumberOfChildren(obj, **args)
+
+        result = [messages.listItemCount(obj.childCount)]
+        result.extend(self.voice(speech_generator.SYSTEM))
+        return result
+
     # TODO - JD: Yet another dumb generator method we should kill.
     def _generateTextRole(self, obj, **args):
         return self._generateRoleName(obj, **args)
diff --git a/src/orca/speech_generator.py b/src/orca/speech_generator.py
index 97bc8bb..4e8d614 100644
--- a/src/orca/speech_generator.py
+++ b/src/orca/speech_generator.py
@@ -1398,14 +1398,8 @@ class SpeechGenerator(generator.Generator):
         if _settingsManager.getSetting('onlySpeakDisplayedText'):
             return []
 
-        acss = self.voice(SYSTEM)
-        role = args.get('role', obj.getRole())
-        if role in [pyatspi.ROLE_LIST, pyatspi.ROLE_LIST_BOX]:
-            result = [messages.listItemCount(obj.childCount)]
-            result.extend(acss)
-            return result
-
         result = []
+        acss = self.voice(SYSTEM)
         childNodes = self._script.utilities.childNodes(obj)
         children = len(childNodes)
         if children: