[orca] Get Orca working with the new D-Bus-based pyatspi This currently relies on a couple uncommitted patc

[William Walker <wwalker src gnome org>]

commit cdf6fd199a57d6968cea3dafd947674a091dbcd5
Author: Willie Walker <william walker sun com>
Date:   Fri Sep 25 09:58:32 2009 -0400

    Get Orca working with the new D-Bus-based pyatspi This currently relies on a couple uncommitted patches for AT-SPI/D-Bus: https://bugs.freedesktop.org/show_bug.cgi?id=24106 https://bugs.freedesktop.org/show_bug.cgi?id=24108

 src/orca/focus_tracking_presenter.py |    4 ++--
 src/orca/settings.py                 |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/src/orca/focus_tracking_presenter.py b/src/orca/focus_tracking_presenter.py
index c6767a3..ca580b0 100644
--- a/src/orca/focus_tracking_presenter.py
+++ b/src/orca/focus_tracking_presenter.py
@@ -1095,6 +1095,7 @@ class FocusTrackingPresenter(presentation_manager.PresentationManager):
                     self.detail1 = detail1
                     self.detail2 = detail2
                     self.any_data = any_data
+                    self.host_application = None
 
             class _FakeData:
                 def __init__(self):
@@ -1103,8 +1104,7 @@ class FocusTrackingPresenter(presentation_manager.PresentationManager):
                     return None
 
             fe = _FakeEvent(win, "window:activate", 0, 0, _FakeData())
-            e = pyatspi.event.Event(fe)
-            self._enqueueEvent(e)
+            self._enqueueEvent(fe)
 
     def deactivate(self):
         """Called when this presentation manager is deactivated."""
diff --git a/src/orca/settings.py b/src/orca/settings.py
index b18c423..6a02f2a 100644
--- a/src/orca/settings.py
+++ b/src/orca/settings.py
@@ -899,7 +899,8 @@ doubleClickTimeout = 0.5
 #
 def isAccessibilityEnabled():
     try:
-        return gconfClient.get_bool("/desktop/gnome/interface/accessibility")
+        return gconfClient.get_bool("/desktop/gnome/interface/accessibility") \
+            or gconfClient.get_bool("/desktop/gnome/interface/accessibility2")
     except:
         return False