[dasher: 100/217] Remove support for deprecated GnomeSpeech (#42)

[Patrick Welche <pwelche src gnome org>]

commit 81f115017b896c884b7f510ff8bbf5c80752130a
Author: David Barnett <dbarnett google com>
Date:   Thu Oct 29 23:06:40 2015 -0700

    Remove support for deprecated GnomeSpeech (#42)

 INSTALL.Linux            |    3 +-
 README                   |    1 -
 Src/Gtk2/GnomeSpeech.cpp |   78 ----------------------------------------------
 Src/Gtk2/Makefile.am     |    3 --
 Src/Gtk2/Speech.h        |    9 -----
 Src/main.cc              |    4 +-
 configure.ac             |   15 +--------
 7 files changed, 4 insertions(+), 109 deletions(-)
---
diff --git a/INSTALL.Linux b/INSTALL.Linux
index 2d99f29..84ea60c 100644
--- a/INSTALL.Linux
+++ b/INSTALL.Linux
@@ -33,8 +33,7 @@ following configure-time options are specific to Dasher (see section
 Options
 =======
 
-   --disable-speech    Disable speech support (speech dispatcher and
-                       GNOME speech).
+   --disable-speech    Disable speech support (speech dispatcher).
 
    --disable-a11y      Disable support for GNOME 2 accessibility features
                        (enabled by default).
diff --git a/README b/README
index 925f035..8092fd9 100644
--- a/README
+++ b/README
@@ -20,7 +20,6 @@ General:
 Linux (see INSTALL.Linux for build time requirements):
  * GTK+ (2.6 or greater) (required)
  * GNOME (optional, but highly recommended)
- * GNOME Speech (optional)
  * Libcanna (optional, for Hiragana to Kanji conversion)
  
 MS Windows:
diff --git a/Src/Gtk2/Makefile.am b/Src/Gtk2/Makefile.am
index 626b034..e456f49 100644
--- a/Src/Gtk2/Makefile.am
+++ b/Src/Gtk2/Makefile.am
@@ -54,9 +54,6 @@ libdashercontrol_la_SOURCES += NoStore.cpp
 endif
 endif
 
-if USE_GNOMESPEECH
-libdashercontrol_la_SOURCES += GnomeSpeech.cpp
-endif
 if USE_SPEECHDISPATCHER
 libdashercontrol_la_SOURCES += SpeechDispatcher.cpp
 endif
diff --git a/Src/Gtk2/Speech.h b/Src/Gtk2/Speech.h
index effbbd0..dc8d3ea 100644
--- a/Src/Gtk2/Speech.h
+++ b/Src/Gtk2/Speech.h
@@ -6,10 +6,6 @@
 #endif
 #include <string>
 
-#ifdef GNOME_SPEECH
-#include <gnome-speech/gnome-speech.h>
-#include <libbonobo.h>
-#endif
 #ifdef HAVE_SPEECHD
 #include <speech-dispatcher/libspeechd.h>
 #endif
@@ -21,11 +17,6 @@ public:
   bool Init();
   void Speak(const std::string &strText, bool bInterrupt);
 private:
-#ifdef GNOME_SPEECH
-  GNOME_Speech_SynthesisDriver m_driver;
-  GNOME_Speech_Speaker m_speaker;
-  CORBA_Environment m_ev;
-#endif
 #ifdef HAVE_SPEECHD
   SPDConnection *m_speaker;
 #endif
diff --git a/Src/main.cc b/Src/main.cc
index f53c0ae..460a528 100644
--- a/Src/main.cc
+++ b/Src/main.cc
@@ -18,7 +18,7 @@
 #endif
 
 // TODO: This shouldn't need to be here
-#if defined(GNOME_SPEECH) || defined(USE_CSPI)
+#ifdef USE_CSPI
 #include <libbonobo.h>
 #endif
 
@@ -201,7 +201,7 @@ int main(int argc, char *argv[]) {
   osso_context = osso_initialize("dasher", PACKAGE_VERSION, TRUE, NULL);
 #endif
 
-#if defined(GNOME_SPEECH) || defined(USE_CSPI)
+#ifdef USE_CSPI
   if(!bonobo_is_initialized()) {
     if(!bonobo_init(&argc, argv)) {
       g_error("Can't initialize Bonobo...\n");
diff --git a/configure.ac b/configure.ac
index 00d938b..7c0036a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,7 +78,7 @@ AC_ARG_WITH([gnome],
        WITHGNOME=true)
 
 AC_ARG_ENABLE([speech],
-       [AS_HELP_STRING([--enable-speech=@<:@speechdispatcher,gnomespeech@:>@],
+       [AS_HELP_STRING([--enable-speech=@<:@speechdispatcher@:>@],
                [build with speech support (default is YES)])])
 
 AC_ARG_WITH([qte],
@@ -265,8 +265,6 @@ fi
 dnl default: enable speech
 dnl if speechdispatcher or default
 dnl   check for speechdispatcher
-dnl if gnomespeech or (default and nothing found)
-dnl   check for gnomespeech
 dnl if nothing found
 dnl   OK if wanted no speech
 dnl   warn if default
@@ -288,16 +286,6 @@ AS_IF(
                         SPEECH_LDFLAGS=
                         SPEECH_LIBS=-lspeechd])])])
 AS_IF(
-       [test "x$enable_speech" = xgnomespeech -o "x$enable_speech" = xyes -a $speech_module = none],
-       [PKG_CHECK_MODULES([gnome_speech],
-               [gnome-speech-1.0 bonobo-activation-2.0 libbonobo-2.0 ORBit-2.0],
-               [AC_DEFINE([GNOME_SPEECH], 1, [gnome_speech-1 libraries are present])
-                SPEECH_CPPFLAGS=$gnome_speech_CFLAGS
-                SPEECH_LDFLAGS=$gnome_speech_LIBS
-                SPEECH_LIBS=$gnome_speech_LIBS
-                speech_module=gnomespeech],
-               [:])])
-AS_IF(
        [test $speech_module = none],
        [AS_CASE(["x$enable_speech"],
                [xno],
@@ -421,7 +409,6 @@ AM_CONDITIONAL(USE_GCONF, test x$have_gconf = xtrue)
 AM_CONDITIONAL(USE_GSETTINGS, test x$have_gsettings = xtrue)
 AM_CONDITIONAL(DOGTK, test x$BUILDGTK = xtrue)
 AM_CONDITIONAL(DOQTE, test x$WITHQTE = xtrue)
-AM_CONDITIONAL(USE_GNOMESPEECH, test $speech_module = gnomespeech)
 AM_CONDITIONAL(USE_SPEECHDISPATCHER, test $speech_module = speechdispatcher)
 AM_CONDITIONAL(GNOME_HELP, test x$WITHGNOME = xtrue)
 AM_CONDITIONAL(WITH_GPE, test x$WITHGPE = xtrue)