[orca] Always respect braille verbosity levels when presenting widget roles

[Joanmarie Diggs <joanied src gnome org>]

commit 1688ce2f82b6cce4862d0d0f5ddf18e53a1205e8
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Wed Jun 4 07:12:54 2014 -0400

    Always respect braille verbosity levels when presenting widget roles

 src/orca/braille_generator.py |    6 ++----
 src/orca/settings.py          |    3 ---
 2 files changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/src/orca/braille_generator.py b/src/orca/braille_generator.py
index 4636326..145f159 100644
--- a/src/orca/braille_generator.py
+++ b/src/orca/braille_generator.py
@@ -145,10 +145,8 @@ class BrailleGenerator(generator.Generator):
         if verbosityLevel == settings.VERBOSITY_LEVEL_BRIEF:
             doNotPresent.extend([pyatspi.ROLE_ICON, pyatspi.ROLE_CANVAS])
 
-        if (role in _settingsManager.getSetting('brailleForceRoles'))\
-           or (verbosityLevel == settings.VERBOSITY_LEVEL_VERBOSE\
-               and not args.get('readingRow', False)\
-               and role not in doNotPresent):
+        if verbosityLevel == settings.VERBOSITY_LEVEL_VERBOSE \
+           and not args.get('readingRow', False) and role not in doNotPresent:
             result.append(self.getLocalizedRoleName(obj, role))
         return result
 
diff --git a/src/orca/settings.py b/src/orca/settings.py
index 33fa71e..dde127f 100644
--- a/src/orca/settings.py
+++ b/src/orca/settings.py
@@ -229,9 +229,6 @@ flashVerbosityLevel            = VERBOSITY_LEVEL_VERBOSE
 brailleAlignmentStyle          = BRAILLE_ALIGN_BY_EDGE
 brailleAlignmentMargin         = 3
 brailleMaximumJump             = 8
-brailleForceRoles              = [pyatspi.ROLE_COMBO_BOX,
-                                  pyatspi.ROLE_MENU,
-                                  pyatspi.ROLE_TEAROFF_MENU_ITEM]
 
 # Keyboard and Echo
 keyboardLayout               = GENERAL_KEYBOARD_LAYOUT_DESKTOP