[orca] Disable caret navigation in menus and menu items

[Joanmarie Diggs <joanied src gnome org>]

commit 3987d83a6913d697179b61a1d1cab4505841af7a
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Thu Aug 7 10:01:23 2014 -0400

    Disable caret navigation in menus and menu items

 src/orca/scripts/toolkits/Gecko/script.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/src/orca/scripts/toolkits/Gecko/script.py b/src/orca/scripts/toolkits/Gecko/script.py
index 4758115..62ff079 100644
--- a/src/orca/scripts/toolkits/Gecko/script.py
+++ b/src/orca/scripts/toolkits/Gecko/script.py
@@ -1812,7 +1812,7 @@ class Script(default.Script):
                 if not weHandleIt:
                     weHandleIt = role == pyatspi.ROLE_MENU_ITEM
 
-        elif role in [pyatspi.ROLE_COMBO_BOX, pyatspi.ROLE_MENU_ITEM, pyatspi.ROLE_LIST_BOX]:
+        elif role in [pyatspi.ROLE_COMBO_BOX, pyatspi.ROLE_LIST_BOX]:
             weHandleIt = keyboardEvent.event_string in ["Left", "Right"]
 
         elif role == pyatspi.ROLE_LIST_ITEM:
@@ -1821,6 +1821,9 @@ class Script(default.Script):
         elif role == pyatspi.ROLE_LIST:
             weHandleIt = not obj.getState().contains(pyatspi.STATE_FOCUSABLE)
 
+        elif role in [pyatspi.ROLE_MENU, pyatspi.ROLE_MENU_ITEM]:
+            weHandleIt = False
+
         return weHandleIt
 
     def useStructuralNavigationModel(self):