[orca/gnome-3-20] Eliminate double presentation of inferred label

[Joanmarie Diggs <joanied src gnome org>]

commit dee0d849d9a33d6841bb4e9a2f7c60bded327c33
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Sun May 8 14:24:55 2016 -0400

    Eliminate double presentation of inferred label

 src/orca/scripts/web/script_utilities.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/orca/scripts/web/script_utilities.py b/src/orca/scripts/web/script_utilities.py
index 7dc2381..498deee 100644
--- a/src/orca/scripts/web/script_utilities.py
+++ b/src/orca/scripts/web/script_utilities.py
@@ -2346,7 +2346,7 @@ class Utilities(script_utilities.Utilities):
             return False
 
         rv = self._shouldInferLabelFor.get(hash(obj))
-        if rv:
+        if rv and not self._script._lastCommandWasCaretNav:
             return not self._script.inSayAll()
         if rv == False:
             return rv
@@ -2361,7 +2361,7 @@ class Utilities(script_utilities.Utilities):
         else:
             if name:
                 rv = False
-            else:
+            elif not rv:
                 roles =  [pyatspi.ROLE_CHECK_BOX,
                           pyatspi.ROLE_COMBO_BOX,
                           pyatspi.ROLE_ENTRY,