orca r3609 - in trunk: . src/orca

[joanied svn gnome org]

Author: joanied
Date: Wed Feb 20 01:34:37 2008
New Revision: 3609
URL: http://svn.gnome.org/viewvc/orca?rev=3609&view=rev

Log:
* src/orca/Gecko.py: 
  Fix for bug #517371 - Orca gets stuck when browsing humanware.ca
  in FF3.


Modified:
   trunk/ChangeLog
   trunk/src/orca/Gecko.py

Modified: trunk/src/orca/Gecko.py
==============================================================================
--- trunk/src/orca/Gecko.py	(original)
+++ trunk/src/orca/Gecko.py	Wed Feb 20 01:34:37 2008
@@ -7533,13 +7533,19 @@
             if unicodeText.startswith(self.EMBEDDED_OBJECT_CHARACTER):
                 childIndex = self.getChildIndex(obj, start)
                 if childIndex >= 0:
-                    obj = obj[childIndex]
-                    text = self.queryNonEmptyText(obj)
-                    if text:
-                        noChars = text.characterCount
-                        [line, start, end] = text.getTextAtOffset(noChars - 1,
-                                                                  boundary)
-
+                    child = obj[childIndex]
+                    childText = self.queryNonEmptyText(child)
+                    if childText:
+                        noChars = childText.characterCount
+                        [line, start, end] = \
+                               childText.getTextAtOffset(noChars - 1, boundary)
+                        obj = child
+                    elif child.getRole() != pyatspi.ROLE_LINK:
+                        text = None
+                        obj = child
+                    else:
+                        [line, start, end] = \
+                               text.getTextAfterOffset(offset, boundary)
         if text:
             offset = start
         else: