orca r3506 - in trunk: . src/orca

[joanied svn gnome org]

Author: joanied
Date: Sun Jan 27 02:41:09 2008
New Revision: 3506
URL: http://svn.gnome.org/viewvc/orca?rev=3506&view=rev

Log:
* src/orca/Gecko.py:
  Fix for bug #510478 - Character navigation in FF wraps from
  bottom of file to top.



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	Sun Jan 27 02:41:09 2008
@@ -8115,13 +8115,14 @@
                                                                characterOffset)
             if obj and obj.getState().contains(pyatspi.STATE_VISIBLE):
                 break
-        if obj:
-            self.setCaretPosition(obj, characterOffset)
+
+        if not obj:
+            [obj, characterOffset] = self.getBottomOfFile()
         else:
-            self.clearCaretContext()
+            self.speakCharacterAtOffset(obj, characterOffset)
 
+        self.setCaretPosition(obj, characterOffset)
         self.updateBraille(obj)
-        self.speakCharacterAtOffset(obj, characterOffset)
 
     def goPreviousCharacter(self, inputEvent):
         """Positions the caret offset to the previous character or object
@@ -8134,13 +8135,13 @@
             if obj and obj.getState().contains(pyatspi.STATE_VISIBLE):
                 break
 
-        if obj:
-            self.setCaretPosition(obj, characterOffset)
+        if not obj:
+            [obj, characterOffset] = self.getTopOfFile()
         else:
-            self.clearCaretContext()
+            self.speakCharacterAtOffset(obj, characterOffset)
 
+        self.setCaretPosition(obj, characterOffset)
         self.updateBraille(obj)
-        self.speakCharacterAtOffset(obj, characterOffset)
 
     def goPreviousWord(self, inputEvent):
         """Positions the caret offset to beginning of the previous