[orca/570658] Fix braille for images and links

[William Walker <wwalker src gnome org>]

commit e15301ffa5dd90ca782f26837cfeadbc832c1628
Author: Willie Walker <william walker sun com>
Date:   Wed Jul 1 13:06:53 2009 -0400

    Fix braille for images and links

 src/orca/scripts/toolkits/Gecko/formatting.py |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)
---
diff --git a/src/orca/scripts/toolkits/Gecko/formatting.py b/src/orca/scripts/toolkits/Gecko/formatting.py
index 98f022f..a5e1ff7 100644
--- a/src/orca/scripts/toolkits/Gecko/formatting.py
+++ b/src/orca/scripts/toolkits/Gecko/formatting.py
@@ -89,18 +89,28 @@ formatting = {
         },
         pyatspi.ROLE_IMAGE: {
             'focused':   '(imageLink\
-                           and [Link(obj, asString(((label + displayedText) or name) + value + roleName))]\
-                           or [Component(obj, asString(((label + displayedText) or name) + value + roleName))])',
-            'unfocused': '(imageLink\
-                           and [Link(obj, asString(((label + displayedText) or name) + value + roleName))]\
-                           or [Component(obj, asString(((label + displayedText) or name) + value + roleName))])'
+                           and [Link(obj, (asString(label + displayedText)\
+                                           or asString(name))\
+                                          + " " + asString(value + roleName))]\
+                           or [Component(obj, asString(label + displayedText)\
+                                              + " " + asString(value + roleName))])',
+            'unfocused':  '(imageLink\
+                           and [Link(obj, (asString(label + displayedText)\
+                                           or asString(name))\
+                                          + " " + asString(value + roleName))]\
+                           or [Component(obj, asString(label + displayedText)\
+                                              + " " + asString(value + roleName))])',
         },
         # [[[TODO: WDW - yikes!  We need more parameters to send to
         # the Link constructor.]]]
         #
         pyatspi.ROLE_LINK: {
-            'focused':   '[Link(obj, asString((currentLineText and len(currentLineText[0]) and currentLineText) or displayedText or name))]',
-            'unfocused': '[Link(obj, asString((currentLineText and len(currentLineText[0]) and currentLineText) or displayedText or name))]'
+            'focused':   '[Link(obj, asString(currentLineText)\
+                                     or asString(displayedText)\
+                                     or asString(name))]',
+            'unfocused': '[Link(obj, asString(currentLineText)\
+                                     or asString(displayedText)\
+                                     or asString(name))]',
         }
     }
 }