[orca/gnome-3-16] Use labelOrName instead of labelAndName with toggle buttons

[Joanmarie Diggs <joanied src gnome org>]

commit d372dd5ea102587014e7e19c42f5046ac17a9746
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Thu Mar 26 17:00:08 2015 -0400

    Use labelOrName instead of labelAndName with toggle buttons
    
    The latter has more fallback code, ultimately looking at the description
    if all else fails.

 src/orca/formatting.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/orca/formatting.py b/src/orca/formatting.py
index 4410753..44dc4a3 100644
--- a/src/orca/formatting.py
+++ b/src/orca/formatting.py
@@ -343,8 +343,8 @@ formatting = {
             },
         pyatspi.ROLE_TOGGLE_BUTTON: {
             'focused': 'expandableState or toggleState',
-            'unfocused': 'labelOrName + roleName + (expandableState or toggleState) + availability + ' + 
MNEMONIC + ' + accelerator',
-            'basicWhereAmI': 'labelOrName + roleName + (expandableState or toggleState)'
+            'unfocused': 'labelAndName + roleName + (expandableState or toggleState) + availability + ' + 
MNEMONIC + ' + accelerator',
+            'basicWhereAmI': 'labelAndName + roleName + (expandableState or toggleState)'
             },
         pyatspi.ROLE_TOOL_TIP: {
             'unfocused': 'labelAndName',