[orca] Don't present text-inserted events for non-ARIA labels

[Joanmarie Diggs <joanied src gnome org>]

commit 41c16133789de74801181e42d2e1c1d16d7d7792
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Fri Jan 24 12:03:57 2014 -0500

    Don't present text-inserted events for non-ARIA labels

 src/orca/scripts/default.py |   19 ++++++-------------
 1 files changed, 6 insertions(+), 13 deletions(-)
---
diff --git a/src/orca/scripts/default.py b/src/orca/scripts/default.py
index 3a83e57..330ca42 100644
--- a/src/orca/scripts/default.py
+++ b/src/orca/scripts/default.py
@@ -2589,24 +2589,21 @@ class Script(script.Script):
             and (event.source.parent != orca_state.locusOfFocus):
             return
 
-        # We'll also ignore sliders because we get their output via
-        # their values changing.
-        #
-        if event.source.getRole() == pyatspi.ROLE_SLIDER:
+        ignoreRoles = [pyatspi.ROLE_LABEL,
+                       pyatspi.ROLE_SLIDER,
+                       pyatspi.ROLE_SPIN_BUTTON]
+        role = event.source.getRole()
+        if role in ignoreRoles:
             return
 
         state = event.source.getState()            
-        if event.source.getRole() == pyatspi.ROLE_TABLE_CELL \
+        if role == pyatspi.ROLE_TABLE_CELL \
            and not state.contains(pyatspi.STATE_FOCUSED) \
            and not state.contains(pyatspi.STATE_SELECTED):
             return
 
         self.updateBraille(event.source)
 
-        if event.source.getRole() == pyatspi.ROLE_SPIN_BUTTON:
-            # Value-changed events should not be handled here.
-            return
-
         # If the last input event was a keyboard event, check to see if
         # the text for this event matches what the user typed. If it does,
         # then don't speak it.
@@ -2626,10 +2623,6 @@ class Script(script.Script):
         speakThis = False
         wasCommand = False
         wasAutoComplete = False
-        try:
-            role = event.source.getRole()
-        except:
-            role = None
         if isinstance(orca_state.lastInputEvent, input_event.MouseButtonEvent):
             speakThis = orca_state.lastInputEvent.button == "2"
         else: