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

[joanied svn gnome org]

Author: joanied
Date: Mon Jul 28 23:26:01 2008
New Revision: 4068
URL: http://svn.gnome.org/viewvc/orca?rev=4068&view=rev

Log:
* src/orca/scripts/toolkits/Gecko/script.py:
  Fix for bug #544197 - Orca speaks nothing when first tabbing into
  the document frame in firefox.

* src/orca/scripts/toolkits/Gecko/script.py:
  Fix for bug #544771 - Orca no longer moving the cursor on same page
  links.


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	Mon Jul 28 23:26:01 2008
@@ -1260,8 +1260,12 @@
                 # 1. If the object is an entry and useCaretNavigationModel is
                 #    true, then we must be at the edge of the entry and about
                 #    to exit it (returning to the document).
+                # 2. If the locusOfFocus was a same-page link, we will get a
+                #    caret moved event for some object within the document
+                #    frame.
                 #
-                if eventSourceRole != pyatspi.ROLE_ENTRY:
+                if eventSourceRole != pyatspi.ROLE_ENTRY \
+                   and self.isSameObject(event.source, orca_state.locusOfFocus):
                     return
 
             elif self.isAriaWidget(event.source):
@@ -1472,7 +1476,8 @@
                 [obj, characterOffset] = self.getCaretContext()
                 state = obj.getState()
                 if not state.contains(pyatspi.STATE_FOCUSED):
-                    if not state.contains(pyatspi.STATE_FOCUSABLE):
+                    if not state.contains(pyatspi.STATE_FOCUSABLE) \
+                       or not self.inDocumentContent():
                         orca.setLocusOfFocus(event, obj)
                     return
             except: