orca r3962 - in trunk: . src/orca/scripts/toolkits/Gecko

[eitani svn gnome org]

Author: eitani
Date: Thu Jun  5 18:04:03 2008
New Revision: 3962
URL: http://svn.gnome.org/viewvc/orca?rev=3962&view=rev

Log:
    * src/orca/scripts/toolkits/Gecko/script.py:
      Fixed bug 531806 â Wrapped item lists don't give proper
      braille in Gecko


Modified:
   trunk/ChangeLog
   trunk/src/orca/scripts/toolkits/Gecko/script.py

Modified: trunk/src/orca/scripts/toolkits/Gecko/script.py
==============================================================================
--- trunk/src/orca/scripts/toolkits/Gecko/script.py	(original)
+++ trunk/src/orca/scripts/toolkits/Gecko/script.py	Thu Jun  5 18:04:03 2008
@@ -5956,12 +5956,20 @@
 
         contextObj, contextCaret = self.getCaretContext()
 
-        string, caretOffset, startOffset = \
-            default.Script.getTextLineAtCaret(self, obj)
-
-        if contextObj == obj:
-            if not obj.getState().contains(pyatspi.STATE_EDITABLE):
+        if contextObj == obj and \
+                not obj.getState().contains(pyatspi.STATE_EDITABLE):
+            try:
+                ti = obj.queryText()
+            except NotImplementedError:
+                return ["", 0, 0]
+            else:
+                string, startOffset, endOffset = ti.getTextAtOffset(
+                    contextCaret, pyatspi.TEXT_BOUNDARY_LINE_START)
                 caretOffset = contextCaret
+        else:
+            string, caretOffset, startOffset = \
+                default.Script.getTextLineAtCaret(self, obj)
+
 
         return string, caretOffset, startOffset