[orca] Eliminate some false positives regarding modifiers during navigation

[Joanmarie Diggs <joanied src gnome org>]

commit 5fbd8ab2a4829e9d93b7b82c2f941d3e8b84ddf2
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Sat Feb 13 19:40:54 2016 -0500

    Eliminate some false positives regarding modifiers during navigation

 src/orca/script_utilities.py |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/src/orca/script_utilities.py b/src/orca/script_utilities.py
index 58cdf4a..58c3abd 100644
--- a/src/orca/script_utilities.py
+++ b/src/orca/script_utilities.py
@@ -3524,45 +3524,45 @@ class Utilities:
 
     def lastInputEventWasCharNav(self):
         keyString, mods = self.lastKeyAndModifiers()
-        if not mods:
-            return keyString in ["Left", "Right"]
+        if not keyString in ["Left", "Right"]:
+            return False
 
-        return False
+        return not (mods & keybindings.CTRL_MODIFIER_MASK)
 
     def lastInputEventWasWordNav(self):
         keyString, mods = self.lastKeyAndModifiers()
-        if mods & keybindings.CTRL_MODIFIER_MASK:
-            return keyString in ["Left", "Right"]
+        if not keyString in ["Left", "Right"]:
+            return False
 
-        return False
+        return mods & keybindings.CTRL_MODIFIER_MASK
 
     def lastInputEventWasLineNav(self):
         keyString, mods = self.lastKeyAndModifiers()
-        if not mods:
-            return keyString in ["Up", "Down"]
+        if not keyString in ["Up", "Down"]:
+            return False
 
-        return False
+        return not (mods & keybindings.CTRL_MODIFIER_MASK)
 
     def lastInputEventWasLineBoundaryNav(self):
         keyString, mods = self.lastKeyAndModifiers()
-        if not mods:
-            return keyString in ["Home", "End"]
+        if not keyString in ["Home", "End"]:
+            return False
 
-        return False
+        return not (mods & keybindings.CTRL_MODIFIER_MASK)
 
     def lastInputEventWasPageNav(self):
         keyString, mods = self.lastKeyAndModifiers()
-        if not mods:
-            return keyString in ["Page_Up", "Page_Down"]
+        if not keyString in ["Page_Up", "Page_Down"]:
+            return False
 
-        return False
+        return not (mods & keybindings.CTRL_MODIFIER_MASK)
 
     def lastInputEventWasFileBoundaryNav(self):
         keyString, mods = self.lastKeyAndModifiers()
-        if mods & keybindings.CTRL_MODIFIER_MASK:
-            return keyString in ["Home", "End"]
+        if not keyString in ["Home", "End"]:
+            return False
 
-        return False
+        return mods & keybindings.CTRL_MODIFIER_MASK
 
     def lastInputEventWasCaretNavWithSelection(self):
         keyString, mods = self.lastKeyAndModifiers()