[orca/introspection] Fixed most of the combo box issues:

[Joanmarie Diggs <joanied src gnome org>]

commit d698e3489b8c61216dc4d051b618a3535c7cc07d
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Fri Aug 26 17:55:00 2011 -0400

    Fixed most of the combo box issues:
    
    * tracebacks
    * values not getting saved
    * text appearing twice in the widget
    
    The size allocation warnings are still present at the moment.

 src/orca/orca-setup.ui     |    6 +++---
 src/orca/orca_gui_prefs.py |   14 +++++++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/src/orca/orca-setup.ui b/src/orca/orca-setup.ui
index 9e65017..5e2a6d9 100644
--- a/src/orca/orca-setup.ui
+++ b/src/orca/orca-setup.ui
@@ -1322,7 +1322,7 @@
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <object class="GtkComboBoxText" id="progressBarVerbosity">
+                                                          <object class="GtkComboBox" id="progressBarVerbosity">
                                                             <property name="visible">True</property>
                                                             <property name="model">model7</property>
                                                             <accessibility>
@@ -1461,7 +1461,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkComboBoxText" id="sayAllStyle">
+                                      <object class="GtkComboBox" id="sayAllStyle">
                                         <property name="visible">True</property>
                                         <property name="model">model2</property>
                                         <accessibility>
@@ -2308,7 +2308,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkComboBoxText" id="orcaModifierComboBox">
+                          <object class="GtkComboBox" id="orcaModifierComboBox">
                             <property name="visible">True</property>
                             <property name="model">model8</property>
                             <signal name="changed" handler="orcaModifierChanged"/>
diff --git a/src/orca/orca_gui_prefs.py b/src/orca/orca_gui_prefs.py
index 4c21137..68c83c1 100644
--- a/src/orca/orca_gui_prefs.py
+++ b/src/orca/orca_gui_prefs.py
@@ -2625,7 +2625,9 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
         - widget: the component that generated the signal.
         """
 
-        orcaModifier = widget.get_active_text()
+        model = widget.get_model()
+        myIter = widget.get_active_iter()
+        orcaModifier = model[myIter][0]
         self.prefsDict["orcaModifierKeys"] = orcaModifier.split(', ')
 
     def progressBarVerbosityChanged(self, widget):
@@ -2637,7 +2639,10 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
         - widget: the component that generated the signal.
         """
 
-        progressBarVerbosity = widget.get_active_text()
+        model = widget.get_model()
+        myIter = widget.get_active_iter()
+        progressBarVerbosity = model[myIter][0]
+
         # Translators: Orca has a setting which determines which progress
         # bar updates should be announced. Choosing "All" means that Orca
         # will present progress bar updates regardless of what application
@@ -2673,7 +2678,10 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
         - widget: the component that generated the signal.
         """
 
-        sayAllStyle = widget.get_active_text()
+        model = widget.get_model()
+        myIter = widget.get_active_iter()
+        sayAllStyle = model[myIter][0]
+
         # Translators: If this setting is chosen and the user is reading
         # over an entire document, Orca will pause at the end of each
         # line.