[orca] Move the dbusserver-related code out of Orca proper and into the test harness

[Joanmarie Diggs <joanied src gnome org>]

commit 5ecca2a58218acb0894ae2d55354f6cefcee6d47
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Thu May 10 12:58:34 2012 -0400

    Move the dbusserver-related code out of Orca proper and into the test harness

 src/orca/orca.py       |   17 -----------------
 src/orca/settings.py   |    7 -------
 test/harness/runone.sh |    4 ++++
 3 files changed, 4 insertions(+), 24 deletions(-)
---
diff --git a/src/orca/orca.py b/src/orca/orca.py
index bde8947..5b9bba3 100644
--- a/src/orca/orca.py
+++ b/src/orca/orca.py
@@ -409,9 +409,6 @@ try:
 except RuntimeError:
     pass
 
-if settings.useDBus:
-    import dbusserver
-
 import braille
 import orca_state
 import speech
@@ -737,13 +734,6 @@ def loadUserSettings(script=None, inputEvent=None, skipReloadMessage=False):
 
     # Shutdown the output drivers and give them a chance to die.
 
-    # Only exit the D-Bus server if we're in an environment where there 
-    # is a D-Bus session bus already running.  This helps prevent nastiness
-    # on the login screen.
-    #
-    if settings.useDBus:
-        dbusserver.shutdown()
-
     speech.shutdown()
     braille.shutdown()
 
@@ -829,13 +819,6 @@ def loadUserSettings(script=None, inputEvent=None, skipReloadMessage=False):
     _scriptManager.activate()
     _eventManager.activate()
 
-    # Only start the D-Bus server if we're in an environment where there 
-    # is a D-Bus session bus already running.  This helps prevent nastiness
-    # on the login screen.
-    #
-    if settings.useDBus:
-        dbusserver.init()
-
     debug.println(debug.LEVEL_FINEST, 'INFO: User Settings Loaded')
 
     return True
diff --git a/src/orca/settings.py b/src/orca/settings.py
index 66f9e57..f1c2dfb 100644
--- a/src/orca/settings.py
+++ b/src/orca/settings.py
@@ -282,13 +282,6 @@ speechRateDelta         = 5
 #
 speechPitchDelta        = 0.5
 
-# Whether or not to use DBUS.
-#
-if os.getenv("DBUS_SESSION_BUS_ADDRESS"):
-    useDBus = True
-else:
-    useDBus = False
-
 # If True, enable speech.
 #
 enableSpeech            = True
diff --git a/test/harness/runone.sh b/test/harness/runone.sh
index fa6774c..147a9fd 100755
--- a/test/harness/runone.sh
+++ b/test/harness/runone.sh
@@ -72,6 +72,10 @@ if not orca.debug.debugFile:
         handler.setFormatter(formatter)
         log.addHandler(handler)
         log.setLevel(logging.INFO)
+
+import orca.dbusserver as dbusserver
+dbusserver.init()
+
 EOF
 
 # Set up our local user settings file for the output format we want.