[dasher] Remove cspi/bonobo support.

[Patrick Welche <pwelche src gnome org>]

commit a065f2600d663085215ce8446e9246ff1c483d9a
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Thu Dec 24 16:10:02 2020 +0000

    Remove cspi/bonobo support.

 Src/Gtk2/Makefile.am                     |   8 -
 Src/Gtk2/dasher_editor_external_cspi.cpp | 257 -------------------------------
 Src/Makefile.am                          |   3 -
 Src/main.cc                              |  14 --
 configure.ac                             |  14 --
 5 files changed, 296 deletions(-)
---
diff --git a/Src/Gtk2/Makefile.am b/Src/Gtk2/Makefile.am
index cc2384d9..b7cb2fbf 100644
--- a/Src/Gtk2/Makefile.am
+++ b/Src/Gtk2/Makefile.am
@@ -76,16 +76,8 @@ libdashergtk_la_CPPFLAGS = @ATSPI_CFLAGS@
 libdashergtk_la_LDFLAGS  = @ATSPI_LIBS@
 libdashergtk_la_LIBADD   = @ATSPI_LIBS@
 else
-if USE_CSPI
-libdashergtk_la_SOURCES += \
-               dasher_editor_external_cspi.cpp
-libdashergtk_la_CPPFLAGS = @CSPI_CFLAGS@
-libdashergtk_la_LDFLAGS  = @CSPI_LIBS@
-libdashergtk_la_LIBADD   = @CSPI_LIBS@
-else
 libdashergtk_la_SOURCES += \
                dasher_editor_external_xtest.cpp
 endif
-endif
 
 AM_CXXFLAGS = -I$(srcdir)/../DasherCore -DPROGDATA=\"$(pkgdatadir)\" $(GTKBUILD_CFLAGS) 
diff --git a/Src/Makefile.am b/Src/Makefile.am
index d11a3f82..44bb6965 100644
--- a/Src/Makefile.am
+++ b/Src/Makefile.am
@@ -20,9 +20,6 @@ AM_CXXFLAGS = \
        -DPROGDATA=\"$(pkgdatadir)\" \
        -DSYSCONFDIR=\"$(sysconfdir)\" \
        -DPACKAGE_LOCALE_DIR=\"$(datadir)/locale\"
-if USE_CSPI
-AM_CXXFLAGS += @CSPI_CFLAGS@
-endif
 
 dasher_LDADD = \
        Gtk2/libdashergtk.la \
diff --git a/Src/main.cc b/Src/main.cc
index 308cb930..8edf9775 100644
--- a/Src/main.cc
+++ b/Src/main.cc
@@ -13,11 +13,6 @@
 /* Just to make sure the symbols for the editor are visible. */
 // #include <Gtk2/dasher_editor_internal.h>
 
-// TODO: This shouldn't need to be here
-#ifdef USE_CSPI
-#include <libbonobo.h>
-#endif
-
 #ifdef WITH_GPE
 #include <gpe/init.h>
 #endif
@@ -191,15 +186,6 @@ int main(int argc, char *argv[]) {
   gtk_init(&argc, &argv);
 #endif
 
-#ifdef USE_CSPI
-  if(!bonobo_is_initialized()) {
-    if(!bonobo_init(&argc, argv)) {
-      g_error("Can't initialize Bonobo...\n");
-    }
-    bonobo_activate();
-  }
-#endif
-
   g_set_application_name("Dasher");
   gtk_window_set_default_icon_name("dasher");
 
diff --git a/configure.ac b/configure.ac
index da58f2aa..4549b5eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,9 +82,6 @@ AC_ARG_WITH([gpe],
          fi, 
         WITHGPE=false)
 
-AC_ARG_ENABLE([a11y],
-       [AS_HELP_STRING([--enable-a11y],
-               [with Gtk2 use cspi rather than Xtst for direct entry mode if found (default is YES)])])
 AC_ARG_ENABLE([atspi],
        [AS_HELP_STRING([--enable-atspi],
                [with Gtk3 use atspi rather than Xtst for direct entry mode if found (default is YES)])])
@@ -246,11 +243,6 @@ PKG_CHECK_MODULES([ATSPI],
        [have_libatspi=yes],
        [have_libatspi=no])
 
-PKG_CHECK_MODULES([CSPI],
-       [bonobo-activation-2.0 libbonobo-2.0 ORBit-2.0 cspi-1.0 atk],
-       [have_libcspi=yes],
-       [have_libcspi=no])
-
 AS_IF( [test x$no_x = xyes],
        [AC_MSG_WARN([X development libraries not found])],
        [X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"])
@@ -264,17 +256,11 @@ AS_IF(    [test $have_libatspi = yes -a x$enable_atspi != xno],
                [connect_using=libatspi],
        [test $have_libatspi = no -a x$enable_atspi = xyes],
                [AC_MSG_ERROR([atspi 2 requested but not found])],
-       [test $have_libcspi = yes -a x$enable_a11y != xno],
-               [connect_using=libcspi
-                AC_DEFINE([USE_CSPI], 1, [Use the libcspi for direct mode])],
-       [test $have_libcspi = no -a x$enable_a11y = xyes],
-               [AC_MSG_ERROR([cspi requested but not found])],
        [test $have_libxtst = yes],
                [connect_using=libxtst
                 X_LIBS="$X_LIBS -lXtst"],
        [AC_MSG_ERROR([No method to send characters into another application found])])
 
-AM_CONDITIONAL(USE_CSPI,  test $connect_using = libcspi)
 AM_CONDITIONAL(USE_ATSPI, test $connect_using = libatspi)
 
 if test x"$WITHJAPANESE" = xtrue; then