[orca] Orca's event manager should not import orca



commit c1bca68b52fa6fe5695ea7b296310956220f9d42
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Wed Jun 6 21:14:32 2012 -0400

    Orca's event manager should not import orca

 src/orca/event_manager.py |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/src/orca/event_manager.py b/src/orca/event_manager.py
index 78bba72..a8fe7ef 100644
--- a/src/orca/event_manager.py
+++ b/src/orca/event_manager.py
@@ -30,8 +30,6 @@ import Queue
 import threading
 import time
 
-import orca # Deal with this during final Python 3 conversion
-
 from . import debug
 from . import input_event
 from . import orca_state
@@ -490,8 +488,6 @@ class EventManager:
             try:
                 if event.source == self.registry.getDesktop(0):
                     _scriptManager.reclaimScripts()
-                    if not event.source.childCount:
-                        orca.shutdown()
                     return
             except (LookupError, RuntimeError):
                 # If we got this error here, we'll get it again when we
@@ -517,7 +513,7 @@ class EventManager:
             debug.println(debug.LEVEL_WARNING,
                           "Error while processing event: %s" % eType)
             if eType.startswith("window:deactivate"):
-                orca.setLocusOfFocus(event, None)
+                orca_state.locusOfFocus = None
                 orca_state.activeWindow = None
             return
         except:
@@ -527,7 +523,7 @@ class EventManager:
         if state and state.contains(pyatspi.STATE_DEFUNCT):
             debug.println(debug.LEVEL_FINEST, "IGNORING DEFUNCT OBJECT")
             if eType.startswith("window:deactivate"):
-                orca.setLocusOfFocus(event, None)
+                orca_state.locusOfFocus = None
                 orca_state.activeWindow = None
             return
 



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