[orca] Fix for bgo #577900

[Joanmarie Diggs <joanied src gnome org>]

commit b2d8654a760a3506c814afe56328e6a6683ee9cd
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Thu May 21 16:34:24 2009 -0400

    Fix for bgo #577900
    
    Fix for bgo bug #577900 - Blank lines in Firefox text areas
    incorrectly spoken.
---
 ChangeLog                                 |    6 ++++++
 src/orca/scripts/toolkits/Gecko/script.py |   10 +++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 74fc6ca..b5b1ab6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-21  Joanmarie Diggs <joanmarie diggs gmail com>
+
+        * src/orca/scripts/toolkits/Gecko/script.py:
+          Fix for bug #577900 - Blank lines in Firefox text areas 
+          incorrectly spoken.
+
 2009-05-18  Joanmarie Diggs <joanmarie diggs gmail com>
 
         * src/orca/scripts/apps/Makefile.am:
diff --git a/src/orca/scripts/toolkits/Gecko/script.py b/src/orca/scripts/toolkits/Gecko/script.py
index 8231b95..4ef5a5a 100644
--- a/src/orca/scripts/toolkits/Gecko/script.py
+++ b/src/orca/scripts/toolkits/Gecko/script.py
@@ -1456,8 +1456,11 @@ class Script(default.Script):
         # onCaretMoved will handle.
         #
         if eventSourceInDocument and not self.isAriaWidget(event.source):
-            [obj, characterOffset] = \
-                self.findFirstCaretContext(event.source, event.detail1)
+            if event.source.getRole() != pyatspi.ROLE_ENTRY:
+                [obj, characterOffset] = \
+                    self.findFirstCaretContext(event.source, event.detail1)
+            else:
+                [obj, characterOffset] = [event.source, event.detail1]
             self.setCaretContext(obj, characterOffset)
             orca.setLocusOfFocus(event, obj, notifyPresentationManagers)
             if notifyPresentationManagers:
@@ -2385,7 +2388,8 @@ class Script(default.Script):
         # things, however, we can defer to the default scripts.
         #
 
-        if not self.inDocumentContent():
+        if not self.inDocumentContent() \
+           or obj.getRole() == pyatspi.ROLE_ENTRY:
             default.Script.sayCharacter(self, obj)
             return