[orca] Another keyecho regression fix

[Joanmarie Diggs <joanied src gnome org>]

commit 14f6e30070574325ef78f92b8c30b1cb9cb8bfae
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Sat Jan 7 11:25:48 2012 -0500

    Another keyecho regression fix

 src/orca/input_event.py |    8 ++++++++
 src/orca/orca.py        |    3 +--
 2 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/src/orca/input_event.py b/src/orca/input_event.py
index 3c2011d..5857df7 100644
--- a/src/orca/input_event.py
+++ b/src/orca/input_event.py
@@ -288,6 +288,11 @@ class KeyboardEvent(InputEvent):
 
         return string in orcaMods
 
+    def isOrcaModified(self):
+        """Return True if this key is Orca modified."""
+
+        return self.modifiers & settings.ORCA_MODIFIER_MASK
+
     def isPrintableKey(self):
         """Return True if this is a printable key."""
 
@@ -397,6 +402,9 @@ class KeyboardEvent(InputEvent):
         if self.shouldEcho == False:
             return False
 
+        if self.isOrcaModified():
+            return False
+
         orca_state.lastKeyEchoTime = time.time()
         debug.println(debug.LEVEL_FINEST,
                       "KeyboardEvent.present: %s" % self.event_string)
diff --git a/src/orca/orca.py b/src/orca/orca.py
index cccee27..32b7dfd 100644
--- a/src/orca/orca.py
+++ b/src/orca/orca.py
@@ -795,8 +795,7 @@ def _processKeyboardEvent(event):
     script = orca_state.activeScript
     if script and isPressedEvent:
         script.presentationInterrupt()
-        if not keyboardEvent.isPrintableKey():
-            keyboardEvent.present()
+        keyboardEvent.present()
  
     # Special modes.
     if not isPressedEvent and keyboardEvent.event_string == "Escape":