[orca] Fix for bgo#621158 - Thunderbird combo box content does not show in Braille when combo has focus

[Joanmarie Diggs <joanied src gnome org>]

commit 07c224730094a00710ba5db685730190a8a86778
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Thu Jun 10 06:27:54 2010 -0400

    Fix for bgo#621158 - Thunderbird combo box content does not show in Braille when combo has focus

 src/orca/script_utilities.py                    |    2 ++
 src/orca/scripts/apps/Thunderbird/formatting.py |    7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/src/orca/script_utilities.py b/src/orca/script_utilities.py
index 8c7477c..7c681ac 100644
--- a/src/orca/script_utilities.py
+++ b/src/orca/script_utilities.py
@@ -536,6 +536,8 @@ class Utilities:
         role = obj.getRole()
         if role == pyatspi.ROLE_COMBO_BOX:
             displayedText = self._displayedTextInComboBox(obj)
+            if not self._script.generatorCache.has_key(self.DISPLAYED_TEXT):
+                self._script.generatorCache[self.DISPLAYED_TEXT] = {}
             self._script.generatorCache[self.DISPLAYED_TEXT][obj] = \
                 displayedText
             return self._script.generatorCache[self.DISPLAYED_TEXT][obj]
diff --git a/src/orca/scripts/apps/Thunderbird/formatting.py b/src/orca/scripts/apps/Thunderbird/formatting.py
index 2815eb2..9255bd9 100644
--- a/src/orca/scripts/apps/Thunderbird/formatting.py
+++ b/src/orca/scripts/apps/Thunderbird/formatting.py
@@ -31,6 +31,7 @@ import copy
 import pyatspi
 
 import orca.formatting
+import orca.scripts.toolkits.Gecko.formatting as GeckoFormatting
 
 formatting = {
     'speech': {
@@ -41,9 +42,9 @@ formatting = {
         }
     }
 
-class Formatting(orca.formatting.Formatting):
+class Formatting(GeckoFormatting.Formatting):
     def __init__(self, script):
-        orca.formatting.Formatting.__init__(self, script)
+        GeckoFormatting.Formatting.__init__(self, script)
         self.update(copy.deepcopy(formatting))
         self._defaultFormatting = orca.formatting.Formatting(script)
 
@@ -51,4 +52,4 @@ class Formatting(orca.formatting.Formatting):
         if args.get('useDefaultFormatting', False):
             return self._defaultFormatting.getFormat(**args)
         else:
-            return orca.formatting.Formatting.getFormat(self, **args)
+            return GeckoFormatting.Formatting.getFormat(self, **args)