orca r3655 - in trunk: . src/orca

[eitani svn gnome org]

Author: eitani
Date: Fri Feb 29 01:55:14 2008
New Revision: 3655
URL: http://svn.gnome.org/viewvc/orca?rev=3655&view=rev

Log:
* src/orca/Gecko.py:
  Fixed extra verbosity in web pages with nested frames (bug #518893).
Squashed commit of the following:

commit 205363e4c9c73febdf85062e8b34b1072dd31f11
Author: Eitan Isaacson <eitan ascender com>
Date:   Thu Feb 28 17:53:36 2008 -0800

    Added log

commit 6d32ce7ba3b014d1a47b7133a0c50fee1370fd33
Author: Eitan Isaacson <eitan ascender com>
Date:   Wed Feb 27 16:48:03 2008 -0800

    * src/orca/Gecko.py: Check parent node if it has a tag of the "browser" sort.

commit e6bcaff51a1c5c8d848f52e091a82ddfa13994dc
Author: Eitan Isaacson <eitan ascender com>
Date:   Tue Feb 26 13:49:33 2008 -0800

    * src/orca/Gecko.py: Fixed stupid error.

commit 97b47d6c2a6d93df8365c36d53938335de38ddc8
Author: Eitan Isaacson <eitan ascender com>
Date:   Tue Feb 26 10:45:30 2008 -0800

    * src/orca/Gecko.py: If the document frame is a nested frame - don't announce when it is focused.


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	Fri Feb 29 01:55:14 2008
@@ -4253,9 +4253,13 @@
         if event.source.getRole() == pyatspi.ROLE_DOCUMENT_FRAME and \
                event.detail1:
             documentFrame = event.source
+
+            parent_attribs = self._getAttrDictionary(documentFrame.parent)
+            parent_tag = parent_attribs.get('tag', '')
             
             if self._loadingDocumentContent or \
-                   documentFrame == self._currentFrame:
+                   documentFrame == self._currentFrame or \
+                   not parent_tag.endswith('browser'):
                 return
 
             self._currentFrame = documentFrame