[orca] Always speak the landmark type before the landmark name/content

[Joanmarie Diggs <joanied src gnome org>]

commit 7d8b2ae327462b44bbf0411beb41dcbec16e8286
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Wed Apr 24 12:46:47 2019 -0400

    Always speak the landmark type before the landmark name/content
    
    Also eliminate duplicate type presentation in structural navigation

 src/orca/formatting.py            | 4 ++--
 src/orca/structural_navigation.py | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/src/orca/formatting.py b/src/orca/formatting.py
index ced03b5cd..905b42788 100644
--- a/src/orca/formatting.py
+++ b/src/orca/formatting.py
@@ -254,8 +254,8 @@ formatting = {
             'basicWhereAmI': 'label + displayedText + allTextSelection + roleName'
             },
         pyatspi.ROLE_LANDMARK: {
-            'focused': 'leaving or (labelAndName + roleName)',
-            'unfocused': '((substring and currentLineText) or labelAndName) + roleName + pause + 
unrelatedLabels'
+            'focused': 'leaving or (roleName + labelAndName)',
+            'unfocused': 'roleName + (labelAndName or (substring and currentLineText)) + pause + 
unrelatedLabels'
             },
         pyatspi.ROLE_LAYERED_PANE: {
             'focused': '(labelAndName or roleName) + availability + noShowingChildren',
diff --git a/src/orca/structural_navigation.py b/src/orca/structural_navigation.py
index 274a5a98f..e208a7d08 100644
--- a/src/orca/structural_navigation.py
+++ b/src/orca/structural_navigation.py
@@ -2263,11 +2263,10 @@ class StructuralNavigation:
         """
 
         if obj:
-            self._script.speakMessage(self._getRoleName(obj))
             landmark = obj
             [obj, characterOffset] = self._getCaretPosition(obj)
             self._setCaretPosition(obj, characterOffset)
-            self._presentLine(obj, characterOffset)
+            self._presentObject(obj, characterOffset)
         else:
             full = messages.NO_LANDMARK_FOUND
             brief = messages.STRUCTURAL_NAVIGATION_NOT_FOUND