[orca/570658] Fix comboboxes for new braille generator (I hope)

[William Walker <wwalker src gnome org>]

commit b3ea19eca5b6a219fff57e33af7472a4256de1bb
Author: Willie Walker <william walker sun com>
Date:   Thu Jul 2 09:44:34 2009 -0400

    Fix comboboxes for new braille generator (I hope)

 .../scripts/toolkits/Gecko/braille_generator.py    |    7 +++----
 src/orca/scripts/toolkits/Gecko/formatting.py      |   15 +++++----------
 2 files changed, 8 insertions(+), 14 deletions(-)
---
diff --git a/src/orca/scripts/toolkits/Gecko/braille_generator.py b/src/orca/scripts/toolkits/Gecko/braille_generator.py
index 252e642..f1016e0 100644
--- a/src/orca/scripts/toolkits/Gecko/braille_generator.py
+++ b/src/orca/scripts/toolkits/Gecko/braille_generator.py
@@ -166,13 +166,12 @@ class BrailleGenerator(braille_generator.BrailleGenerator):
         # the entry seems to still exist on the braille line.  This was
         # in the old (pre-refactor) code, too]]]
         #
-        # [[[TODO: WDW - ROLE_PASSWORD, ROLE_CHECK_BOX and
-        # ROLE_RADIO_BUTTON are absent for reasons similar to
+        # [[[TODO: WDW - ROLE_COMBO_BOX, ROLE_PASSWORD, ROLE_CHECK_BOX
+        # and ROLE_RADIO_BUTTON are absent for reasons similar to
         # ROLE_ENTRY.]]]
         #
         if not len(result) \
-           and role in [pyatspi.ROLE_COMBO_BOX,
-                        pyatspi.ROLE_LIST,
+           and role in [pyatspi.ROLE_LIST,
                         pyatspi.ROLE_PARAGRAPH,
                         pyatspi.ROLE_TEXT] \
            and self._script.inDocumentContent() \
diff --git a/src/orca/scripts/toolkits/Gecko/formatting.py b/src/orca/scripts/toolkits/Gecko/formatting.py
index a5e1ff7..3e295a9 100644
--- a/src/orca/scripts/toolkits/Gecko/formatting.py
+++ b/src/orca/scripts/toolkits/Gecko/formatting.py
@@ -84,16 +84,14 @@ formatting = {
         # the autocomplete acts as more of a container.]]]
         #
         pyatspi.ROLE_AUTOCOMPLETE: {
-            'focused':   '[Component(obj, asString(roleName))]',
             'unfocused': '[Component(obj, asString(roleName))]'
         },
+        pyatspi.ROLE_COMBO_BOX: {
+            'unfocused': '[Component(obj,\
+                                     asString(label + name + roleName),\
+                                     asString(label) and (len(asString(label)) + 1) or 0)]'
+            },
         pyatspi.ROLE_IMAGE: {
-            'focused':   '(imageLink\
-                           and [Link(obj, (asString(label + displayedText)\
-                                           or asString(name))\
-                                          + " " + asString(value + roleName))]\
-                           or [Component(obj, asString(label + displayedText)\
-                                              + " " + asString(value + roleName))])',
             'unfocused':  '(imageLink\
                            and [Link(obj, (asString(label + displayedText)\
                                            or asString(name))\
@@ -105,9 +103,6 @@ formatting = {
         # the Link constructor.]]]
         #
         pyatspi.ROLE_LINK: {
-            'focused':   '[Link(obj, asString(currentLineText)\
-                                     or asString(displayedText)\
-                                     or asString(name))]',
             'unfocused': '[Link(obj, asString(currentLineText)\
                                      or asString(displayedText)\
                                      or asString(name))]',