[evolution-exchange] No Bonobo here any more.

[Milan Crha <mcrha src gnome org>]

commit 73c5d5187c6db225f45e47aca4babdade888c0ec
Author: Milan Crha <mcrha redhat com>
Date:   Fri Oct 2 17:25:02 2009 +0200

    No Bonobo here any more.

 configure.ac                           |    4 -
 eplugin/exchange-folder-subscription.c |    2 +-
 tools/Makefile.am                      |   14 ----
 tools/exchange-autoconfig-wizard.h     |    4 -
 tools/migr-test.c                      |  108 --------------------------------
 5 files changed, 1 insertions(+), 131 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1fbe5f8..4872904 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,6 @@ m4_define([gtk_minimum_version], [2.10.0])
 m4_define([eds_minimum_version], [eex_version])
 m4_define([evo_minimum_version], [eex_version])
 m4_define([gconf_minimum_version], [2.0.0])             # XXX Just a Guess
-m4_define([libbonobo_minimum_version], [2.20.3])
 m4_define([libxml_minimum_version], [2.0.0])            # XXX Just a Guess
 m4_define([libsoup_minimum_version], [2.3.0])
 
@@ -140,7 +139,6 @@ PKG_CHECK_MODULES(GNOME_PLATFORM,
 	[glib-2.0 >= glib_minimum_version
 	 gtk+-2.0 >= gtk_minimum_version
 	 gconf-2.0 >= gconf_minimum_version
-	 libbonobo-2.0 >= libbonobo_minimum_version
 	 libxml-2.0 >= libxml_minimum_version
 	 libsoup-2.4 >= libsoup_minimum_version])
 
@@ -168,8 +166,6 @@ dnl AC_DEFINE(G_DISABLE_DEPRECATED,1,[No deprecated glib functions])
 dnl AC_DEFINE(GDK_DISABLE_DEPRECATED,1,[No deprecated gdk functions])
 dnl AC_DEFINE(GTK_DISABLE_DEPRECATED,1,[No deprecated gtk functions])
 dnl AC_DEFINE(GNOME_DISABLE_DEPRECATED,1,[No deprecated gnome functions])
-dnl AC_DEFINE(BONOBO_DISABLE_DEPRECATED,1,[No deprecated bonobo functions])
-dnl AC_DEFINE(BONOBO_UI_DISABLE_DEPRECATED,1,[No deprecated bonoboui functions])
 dnl AC_DEFINE(GCONF_DISABLE_DEPRECATED,1,[No deprecated gconf functions])
 
 AC_EGREP_HEADER(socklen_t, sys/socket.h, :, AC_DEFINE(socklen_t, int, [Define to "int" if socklen_t is not defined]))
diff --git a/eplugin/exchange-folder-subscription.c b/eplugin/exchange-folder-subscription.c
index 63d2fb2..3371559 100644
--- a/eplugin/exchange-folder-subscription.c
+++ b/eplugin/exchange-folder-subscription.c
@@ -210,7 +210,7 @@ subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data)
 
 			/* It would be nice to insensitivize the OK button appropriately
 			instead of doing this, but unfortunately we can't do this for the
-			Bonobo control.  */
+			control.  */
 			e_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":select-user", NULL);
 		}
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 6118cf2..37fe910 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -15,7 +15,6 @@ AM_CPPFLAGS = \
 
 noinst_PROGRAMS = \
 	exchange-connector-setup
-#	migr-test
 
 noinst_LTLIBRARIES = libevolution-exchange-shared.la
 
@@ -46,19 +45,6 @@ install-exec-local: exchange-connector-setup
 uninstall-local:
 	rm -rf $(DESTDIR)$(bindir)/exchange-connector-setup-$(BASE_VERSION)
 
-#migr_test_SOURCES = \
-#	migr-test.c \
-#	exchange-config-listener.c \
-#	exchange-config-listener.h \
-#	exchange-migrate.c \
-#	exchange-migrate.h
-#
-#migr_test_LDADD = \
-#	$(LDAP_LIBS) \
-#	$(EXCHANGE_STORAGE_LIBS) \
-#	$(LIBEXCHANGE_LIBS)
-#
-
 imagesdir = $(CONNECTOR_DATADIR)/images
 images_DATA = \
 	connector.png \
diff --git a/tools/exchange-autoconfig-wizard.h b/tools/exchange-autoconfig-wizard.h
index 59295f1..53848e9 100644
--- a/tools/exchange-autoconfig-wizard.h
+++ b/tools/exchange-autoconfig-wizard.h
@@ -6,12 +6,8 @@
 
 #include <exchange-types.h>
 
-#include <bonobo/bonobo-object.h>
-
 G_BEGIN_DECLS
 
-BonoboObject *exchange_autoconfig_wizard_new (void);
-
 void          exchange_autoconfig_assistant_run  (void);
 
 G_END_DECLS