[orca] Fix for Bug 652408 - Remove last remnants of bonobo and friends

[Joanmarie Diggs <joanied src gnome org>]

commit 51ef0fc9c36a3e2736ed788861b5efa04cf942dd
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Sun Jun 12 16:13:47 2011 -0400

    Fix for Bug 652408 - Remove last remnants of bonobo and friends

 README                                  |    1 -
 configure.in                            |    6 ------
 src/orca/orca.py                        |    3 +--
 src/orca/orca_console_prefs.py          |   10 ++--------
 src/orca/script.py                      |    9 ---------
 src/orca/scripts/apps/soffice/script.py |    6 ------
 src/orca/settings.py                    |   14 --------------
 7 files changed, 3 insertions(+), 46 deletions(-)
---
diff --git a/README b/README
index c264905..0f652bb 100644
--- a/README
+++ b/README
@@ -31,7 +31,6 @@ Building Orca also requires the development modules for the following
 to be installed:
 
 * Python           - Python platform
-* pyorbit          - Python bindings for ORBit2
 * pygtk            - GTK+ Python bindings
 * pygobject        - Python bindings for the GObject library
 * json-py          - a JSON (http://json.org) reader and writer in Python
diff --git a/configure.in b/configure.in
index 9209560..399af19 100644
--- a/configure.in
+++ b/configure.in
@@ -49,9 +49,6 @@ AM_CHECK_PYMOD(gobject,,,[AC_MSG_ERROR(Could not find python module: gobject)])
 # if DISPLAY is not set, and we don't like that.
 #AM_CHECK_PYMOD(gtk,gdk,,[AC_MSG_ERROR(Could not find python module: gtk.gdk)])
 AM_CHECK_PYMOD(gconf,,,[AC_MSG_ERROR(Could not find python module: gconf)])
-AM_CHECK_PYMOD(ORBit,,[ORBit_available="yes"],[ORBit_available="no"])
-AM_CHECK_PYMOD(ORBit,CORBA,[CORBA_available="yes"],[CORBA_available="no"])
-AM_CHECK_PYMOD(bonobo,,[bonobo_available="yes"],[bonobo_available="no"])
 AM_CHECK_PYMOD(dbus,,,[AC_MSG_ERROR(Could not find python module: dbus)])
 AM_CHECK_PYMOD(pyatspi,,,[AC_MSG_ERROR(Could not find python module: pyatspi)])
 AM_CHECK_PYMOD(cairo,,,[AC_MSG_ERROR(Could not find python module: cairo)])
@@ -151,9 +148,6 @@ echo
 echo "NOTE: Mouse review requires wnck, which was not found."
 fi
 echo
-echo Use ORBit: $ORBit_available
-echo Use CORBA: $CORBA_available
-echo Use bonobo: $bonobo_available
 echo Use brltty: $brlapi_available
 echo Use liblouis: $louis_available
 echo
diff --git a/src/orca/orca.py b/src/orca/orca.py
index c155abd..0a0c6f8 100644
--- a/src/orca/orca.py
+++ b/src/orca/orca.py
@@ -2074,8 +2074,7 @@ def timeout(signum=None, frame=None):
     die(EXIT_CODE_HANG)
 
 def shutdown(script=None, inputEvent=None):
-    """Exits Orca.  Unregisters any event listeners and cleans up.  Also
-    quits the bonobo main loop and resets the initialized state to False.
+    """Exits Orca.  Unregisters any event listeners and cleans up.
 
     Returns True if the shutdown procedure ran or False if this module
     was never initialized.
diff --git a/src/orca/orca_console_prefs.py b/src/orca/orca_console_prefs.py
index 447398a..dc0fbd0 100644
--- a/src/orca/orca_console_prefs.py
+++ b/src/orca/orca_console_prefs.py
@@ -33,7 +33,6 @@ import settings
 import speech
 import speechserver
 import orca
-import orca_prefs
 import time
 
 desktopRunning = False
@@ -130,8 +129,8 @@ def setupSpeech(prefsDict):
     global speechServerChoice
     global speechVoiceChoice
 
-    # Use this because callbacks will often hang when not running
-    # with bonobo main in use.
+    # Use this because callbacks in this setup can hang.
+    # TODO: Is this true still??
     #
     settings.enableSpeechCallbacks = False
 
@@ -628,11 +627,6 @@ def showPreferencesUI(commandLineSettings):
                         import gobject
                         gobject.threads_init()
                         gobject.idle_add(logoutUser)
-                        try:
-                            import bonobo
-                            bonobo.main()
-                        except:
-                            pass
                     break
                 except:
                     stop = False
diff --git a/src/orca/script.py b/src/orca/script.py
index 25b86f2..60f2a98 100644
--- a/src/orca/script.py
+++ b/src/orca/script.py
@@ -110,15 +110,6 @@ class Script:
 
         self.findCommandRun = False
 
-        # Assists with dealing with CORBA COMM_FAILURES.  A failure doesn't
-        # always mean an object disappeared - there just might be a network
-        # glitch.  So, on COMM_FAILURES, we might retry a few times before
-        # giving up on an object.  This might need to be overridden by the
-        # script.  See bug #397787.
-        #
-        self.commFailureWaitTime = settings.commFailureWaitTime
-        self.commFailureAttemptLimit = settings.commFailureAttemptLimit
-
         debug.println(debug.LEVEL_FINE, "NEW SCRIPT: %s" % self.name)
 
     def getListeners(self):
diff --git a/src/orca/scripts/apps/soffice/script.py b/src/orca/scripts/apps/soffice/script.py
index 84be8fb..cc3fcbb 100644
--- a/src/orca/scripts/apps/soffice/script.py
+++ b/src/orca/scripts/apps/soffice/script.py
@@ -113,12 +113,6 @@ class Script(default.Script):
         #
         self.currentParagraph = None
 
-        # Set the number of retries after a COMM_FAILURE to 1. The default
-        # of 5 was not allowing Orca to be responsive in the event of OOo
-        # going into crash recovery mode (see bug #397787).
-        #
-        self.commFailureAttemptLimit = 1
-
     def activate(self):
         """Called when this script is activated."""
         self.savedreadTableCellRow = \
diff --git a/src/orca/settings.py b/src/orca/settings.py
index 0ff2070..a8ce7a0 100644
--- a/src/orca/settings.py
+++ b/src/orca/settings.py
@@ -891,15 +891,6 @@ listShortcutsModeEnabled = False
 from xdg.BaseDirectory import xdg_data_home
 userPrefsDir = os.path.join(xdg_data_home, "orca")
 
-# Assists with dealing with CORBA COMM_FAILURES.  A failure doesn't
-# always mean an object disappeared - there just might be a network
-# glitch.  So, on COMM_FAILURES, we might retry a few times before
-# giving up on an object.  This might need to be overridden by the
-# script.
-#
-commFailureWaitTime = 0.1
-commFailureAttemptLimit = 5
-
 # If non-zero, we use time.sleep() in various places to attempt to
 # free up the global interpreter lock.  Take a look at the following
 # URLs for more information:
@@ -920,11 +911,6 @@ useGILIdleHandler       = False
 #
 useBlockPreventor       = False
 
-# If True, we use the bonobo main loop provided by bonobo to handle
-# all events in atspi.py.  If False, we create our own loop.
-#
-useBonoboMain           = False
-
 # If True, we handle events asynchronously - our normal mode of
 # queueing events and processing them later on the gidle thread.
 # If False, we handle events immediately - helpful for testing.