[orca] Ensure we respect user settings for presentation of landmarks as context

[Joanmarie Diggs <joanied src gnome org>]

commit d05f0f852f0d08b4028da1f5c97ff69c906737c7
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Tue Jan 24 16:56:28 2017 +0100

    Ensure we respect user settings for presentation of landmarks as context

 src/orca/speech_generator.py |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/src/orca/speech_generator.py b/src/orca/speech_generator.py
index ff15644..d8aa108 100644
--- a/src/orca/speech_generator.py
+++ b/src/orca/speech_generator.py
@@ -1677,7 +1677,7 @@ class SpeechGenerator(generator.Generator):
                 if _isCommonAncestor(parent):
                     break
 
-                parentRole = parent.getRole()
+                parentRole = self._getAlternativeRole(parent)
                 if parentRole in stopAtRoles:
                     break
                 if parentRole in skipRoles:
@@ -1685,11 +1685,10 @@ class SpeechGenerator(generator.Generator):
                 elif includeOnly and parentRole not in includeOnly:
                     pass
                 elif not self._script.utilities.isLayoutOnly(parent):
-                    oldRole = self._getAlternativeRole(parent)
-                    self._overrideRole(oldRole, args)
+                    self._overrideRole(parentRole, args)
                     result.append(self.generate(parent, formatType='focused',
-                                                role=oldRole, leaving=leaving))
-                    self._restoreRole(oldRole, args)
+                                                role=parentRole, leaving=leaving))
+                    self._restoreRole(parentRole, args)
                 parent = parent.parent
 
         if not leaving:
@@ -1721,7 +1720,6 @@ class SpeechGenerator(generator.Generator):
                                pyatspi.ROLE_LANDMARK,
                                pyatspi.ROLE_LIST,
                                pyatspi.ROLE_PANEL,
-                               pyatspi.ROLE_SECTION,
                                pyatspi.ROLE_TABLE]
 
         result = []