[orca] Work on bug #640194 - Post-event-manager-refactor sanity checks needed



commit 95bce450bc75019e90e00441a8779a023aa4e92e
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Fri Jan 21 11:29:35 2011 -0500

    Work on bug #640194 - Post-event-manager-refactor sanity checks needed

 src/orca/scripts/apps/Thunderbird/script.py |    1 +
 src/orca/scripts/default.py                 |    4 +++-
 2 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/src/orca/scripts/apps/Thunderbird/script.py b/src/orca/scripts/apps/Thunderbird/script.py
index d145416..b3192b2 100644
--- a/src/orca/scripts/apps/Thunderbird/script.py
+++ b/src/orca/scripts/apps/Thunderbird/script.py
@@ -338,6 +338,7 @@ class Script(Gecko.Script):
         # Handle a newly-opened message.
         #
         if event.source.getRole() == pyatspi.ROLE_DOCUMENT_FRAME \
+           and orca_state.locusOfFocus \
            and orca_state.locusOfFocus.getRole() == pyatspi.ROLE_FRAME:
             if self._messageLoaded:
                 consume = True
diff --git a/src/orca/scripts/default.py b/src/orca/scripts/default.py
index 23b0937..3eecc9f 100644
--- a/src/orca/scripts/default.py
+++ b/src/orca/scripts/default.py
@@ -4426,12 +4426,14 @@ class Script(script.Script):
         # the description is not set, present the text that is
         # spoken when the object receives keyboard focus.
         #
+        speechResult = brailleResult = None
         text = ""
         if obj.description:
             speechResult = brailleResult = obj.description
         else:
             speechResult = self.whereAmI.getWhereAmI(obj, True)
-            brailleResult = speechResult[0]
+            if speechResult:
+                brailleResult = speechResult[0]
         debug.println(debug.LEVEL_FINEST,
                       "presentToolTip: text='%s'" % speechResult)
         if speechResult:



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]