[orca] Fix for bug #652237 - Remove gnome-speech support from the master/3.1.x branch

[Joanmarie Diggs <joanied src gnome org>]

commit 01c30468423e020a361d8b49094493a506860282
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Sat Jun 11 14:35:28 2011 -0400

    Fix for bug #652237 - Remove gnome-speech support from the master/3.1.x branch

 README                         |    1 -
 configure.in                   |    2 -
 src/orca/Makefile.am           |    1 -
 src/orca/gnomespeechfactory.py | 1231 ----------------------------------------
 src/orca/orca.in               |    6 +-
 src/orca/orca_console_prefs.py |    7 +-
 src/orca/orca_gui_prefs.py     |    5 +-
 src/orca/settings.py           |    3 +-
 8 files changed, 9 insertions(+), 1247 deletions(-)
---
diff --git a/README b/README
index aee7950..c264905 100644
--- a/README
+++ b/README
@@ -37,7 +37,6 @@ to be installed:
 * json-py          - a JSON (http://json.org) reader and writer in Python
 * pyxdg            - Python library to access freedesktop.org standards
 * gnome-python     - Python bindings for various GNOME libraries
-* gnome-speech-1.0 - Python bindings for gnome-speech (optional)
 * gnome-mag-1.0    - Python bindings for gnome-mag (optional) 
 * BrlTTY           - BrlTTY support for braille (optional)
 * BrlAPI           - BrlAPI support for braille (optional)
diff --git a/configure.in b/configure.in
index 68efa58..e4d5182 100644
--- a/configure.in
+++ b/configure.in
@@ -59,7 +59,6 @@ AM_CHECK_PYMOD(pango,,,[AC_MSG_ERROR(Could not find python module: pango)])
 AM_CHECK_PYMOD(json,,,[AC_MSG_ERROR(Could not find python module: json)])
 AM_CHECK_PYMOD(xdg,,,[AC_MSG_ERROR(Could not find python module: xdg)])
 AM_CHECK_PYMOD(wnck,,[wnck_available="yes"],[wnck_available="no"])
-AM_CHECK_PYORBIT_MOD(GNOME_Speech,[gnome_speech_available="yes"],[gnome_speech_available="no"])
 AM_CHECK_PYORBIT_MOD(GNOME_Magnifier,[gnome_mag_available="yes"],[gnome_mag_available="no"])
 AM_CHECK_PYMOD(brlapi,,[brlapi_available="yes"],[brlapi_available="no"])
 LOUIS_TABLE_DIR=""
@@ -156,7 +155,6 @@ echo
 echo Use ORBit: $ORBit_available
 echo Use CORBA: $CORBA_available
 echo Use bonobo: $bonobo_available
-echo Use gnome-speech: $gnome_speech_available
 echo Use gnome-mag: $gnome_mag_available
 echo Use brltty: $brlapi_available
 echo Use liblouis: $louis_available
diff --git a/src/orca/Makefile.am b/src/orca/Makefile.am
index 891ecac..8b3b501 100644
--- a/src/orca/Makefile.am
+++ b/src/orca/Makefile.am
@@ -30,7 +30,6 @@ orca_python_PYTHON = \
 	flat_review.py \
 	formatting.py \
 	generator.py \
-	gnomespeechfactory.py \
 	gsmag.py \
 	httpserver.py \
 	input_event.py \
diff --git a/src/orca/orca.in b/src/orca/orca.in
index 2187cef..8450cdc 100644
--- a/src/orca/orca.in
+++ b/src/orca/orca.in
@@ -78,8 +78,8 @@ restoreXmodmap()
 
 # Cleans up any orca-related processes that might be running,
 # restricting it to those processes owned by the user. These include
-# orca itself, any gnome-speech synthesis drivers, and festival
-# processes running in server mode.
+# orca itself, any speech synthesis drivers, and festival processes
+# running in server mode.
 #
 cleanup()
 {
@@ -93,7 +93,7 @@ cleanup()
         KILLARG="-TERM"
     fi
     USERID=$(id -u)
-    PATTERN="orca[.]orca|OAFIID[:]GNOME_Speech|OAFIID[:]GNOME_Magnifier|festival [-][-]server"
+    PATTERN="orca[.]orca|OAFIID[:]GNOME_Magnifier|festival [-][-]server"
 
     pkill $KILLARG -U $USERID -f "$PATTERN"
 }
diff --git a/src/orca/orca_console_prefs.py b/src/orca/orca_console_prefs.py
index 94325a7..447398a 100644
--- a/src/orca/orca_console_prefs.py
+++ b/src/orca/orca_console_prefs.py
@@ -171,10 +171,9 @@ def setupSpeech(prefsDict):
         return False
     elif len(workingFactories) > 1:
         # Translators: the speech system represents what general
-        # speech wrapper is going to be used.  For example,
-        # gnome-speech is a speech system, speech dispatcher is
-        # another, emacspeak is another.  These all then provide
-        # wrappers around specific speech servers (engines).
+        # speech wrapper is going to be used.  Speech-dispatcher
+        # is an example of a speech system. It provides wrappers
+        # around specific speech servers (engines).
         #
         sayAndPrint(_("Select desired speech system:"))
         choices = {}
diff --git a/src/orca/orca_gui_prefs.py b/src/orca/orca_gui_prefs.py
index e339c4f..d691980 100644
--- a/src/orca/orca_gui_prefs.py
+++ b/src/orca/orca_gui_prefs.py
@@ -2711,9 +2711,8 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
         self.pendingKeyBindings = {}
 
     def _cleanupSpeechServers(self):
-        """Remove unwanted factories and gnome-speech drivers for the current
-        active factory, when the user dismisses the Orca Preferences dialog.
-        """
+        """Remove unwanted factories and drivers for the current active
+        factory, when the user dismisses the Orca Preferences dialog."""
 
         for workingFactory in self.workingFactories:
             if not (workingFactory == self.speechSystemsChoice):
diff --git a/src/orca/settings.py b/src/orca/settings.py
index 73870a2..0ff2070 100644
--- a/src/orca/settings.py
+++ b/src/orca/settings.py
@@ -391,8 +391,7 @@ onlySpeakDisplayedText = False
 # Settings that apply to the particular speech engine to
 # use as well details on the default voices to use.
 #
-speechFactoryModules    = ["gnomespeechfactory",
-                           "speechdispatcherfactory",
+speechFactoryModules    = ["speechdispatcherfactory",
                            "espeechfactory"]
 speechServerFactory     = "speechdispatcherfactory"
 speechServerInfo        = None # None means let the factory decide.