orca r3995 - in trunk: . src/orca/scripts/toolkits/Gecko

[joanied svn gnome org]

Author: joanied
Date: Mon Jun 23 15:17:49 2008
New Revision: 3995
URL: http://svn.gnome.org/viewvc/orca?rev=3995&view=rev

Log:
* src/orca/scripts/toolkits/Gecko/speech_generator.py:
  src/orca/scripts/toolkits/Gecko/braille_generator.py:
  Fix for bug #536455 - Contents of "Save In Folder" combo box not
  indicated in speech/braille in Firefox/Thunderbird.


Modified:
   trunk/ChangeLog
   trunk/src/orca/scripts/toolkits/Gecko/braille_generator.py
   trunk/src/orca/scripts/toolkits/Gecko/speech_generator.py

Modified: trunk/src/orca/scripts/toolkits/Gecko/braille_generator.py
==============================================================================
--- trunk/src/orca/scripts/toolkits/Gecko/braille_generator.py	(original)
+++ trunk/src/orca/scripts/toolkits/Gecko/braille_generator.py	Mon Jun 23 15:17:49 2008
@@ -295,6 +295,11 @@
                 # This should work...
                 #
                 child = menu.querySelection().getSelectedChild(0)
+                if not child:
+                    # It's probably a Gtk combo box.
+                    #
+                    return braillegenerator.BrailleGenerator.\
+                        _getBrailleRegionsForComboBox(self, obj)
             except:
                 # But just in case, we'll fall back on this.
                 # [[[TODO - JD: Will we ever have a case where the first

Modified: trunk/src/orca/scripts/toolkits/Gecko/speech_generator.py
==============================================================================
--- trunk/src/orca/scripts/toolkits/Gecko/speech_generator.py	(original)
+++ trunk/src/orca/scripts/toolkits/Gecko/speech_generator.py	Mon Jun 23 15:17:49 2008
@@ -198,6 +198,11 @@
                 # This should work...
                 #
                 child = menu.querySelection().getSelectedChild(0)
+                if not child:
+                    # It's probably a Gtk combo box.
+                    #
+                    return speechgenerator.SpeechGenerator.\
+                        _getSpeechForComboBox(self, obj, already_focused)
             except:
                 # But just in case, we'll fall back on this.
                 # [[[TODO - JD: Will we ever have a case where the first