orca r4682 - in trunk: . src/orca

[wwalker svn gnome org]

Author: wwalker
Date: Wed Apr 15 14:41:55 2009
New Revision: 4682
URL: http://svn.gnome.org/viewvc/orca?rev=4682&view=rev

Log:
Fix for bug #570952 - Orca should be able to run with AT-SPI/D-Bus


Modified:
   trunk/ChangeLog
   trunk/src/orca/gnomespeechfactory.py

Modified: trunk/src/orca/gnomespeechfactory.py
==============================================================================
--- trunk/src/orca/gnomespeechfactory.py	(original)
+++ trunk/src/orca/gnomespeechfactory.py	Wed Apr 15 14:41:55 2009
@@ -36,6 +36,19 @@
 import bonobo
 import ORBit
 
+# Init the ORB if we need to.  With AT-SPI/CORBA, we depend upon the pyatspi
+# implementation to init the ORB for us.  [[[WDW: With AT-SPI/D-Bus, we need
+# to do it ourselves.  I'm not sure how to ask ORBit itself if it's been
+# init'ed yet, so I do so indirectly by looking for an attribute of pyatspi.
+# This attribute has been set if AT-SPI/CORBA is in use and it not set if
+# AT-SPI/D-Bus is in use.]]]
+#
+try:
+    import pyatspi
+    poa = pyatspi.Accessibility__POA
+except AttributeError:
+    orb = ORBit.CORBA.ORB_init()
+
 import chnames
 import debug
 import orca