Various changes to merge in evolution-data-server reliance.

svn path=/trunk/; revision=23206

10 files changed, 0 insertions, 1179 deletions

diff --git a/wombat/.cvsignore b/wombat/.cvsignore
deleted file mode 100644
index 9c09bbbbfb..0000000000
--- a/wombat/.cvsignore
+++ /dev/null
@@ -1,16 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-evolution-wombat
-evolution-wombat.pure
-GNOME_Evolution_Wombat.server
-GNOME_Evolution_Wombat.server.in
-GNOME_Evolution_Wombat.server.in.in
-Evolution-Wombat-common.c
-Evolution-Wombat-skels.c
-Evolution-Wombat-stubs.c
-Evolution-Wombat.h
diff --git a/wombat/ChangeLog b/wombat/ChangeLog
deleted file mode 100644
index a0a17c4b3e..0000000000
--- a/wombat/ChangeLog
+++ /dev/null
@@ -1,64 +0,0 @@
-2003-10-31  Hans Petter Jansson  <hpj@ximian.com>
-
-	* Makefile.am (evolution_wombat_LDADD): Add http backend lib.
-
-	* wombat.c (setup_pcs): Register webcal method for http backend.
-
-2003-10-24  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (evolution_wombat_LDADD): put back the conditional
-	libpasldap stuff, and make evolution-wombat explicitly depend on
-	the specific backends again; libpas itself cannot depend on the
-	backends. Use libpcsfile.la for the calendar dependency, and
-	remove libebook, libcal-util, libedb3util and libeutil, since
-	they're properly pulled in by libtool now.
-
-2003-10-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* GNOME_Evolution_WombatNOLDAP.server.in.in: Add
-	"calendar:supported_protocol" attribute that was missing here (but
-	was in the LDAP one).
-
-2003-10-21  Chris Toshok  <toshok@ximian.com>
-
-	* GNOME_Evolution_WombatLDAP.server.in.in: add vcf to
-	supported_protocols.
-
-	* GNOME_Evolution_WombatNOLDAP.server.in.in: same.
-
-	* wombat.c (setup_pas): register the vcf backend.
-
-	* Makefile.am (evolution_wombat_LDADD): replace the conditional
-	libpasldap stuff and the references to all the libpas* backends
-	with libpas.la.
-
-2003-10-15  Rodrigo Moya <rodrigo@ximian.com>
-
-	* wombat.c (termination_handler): re-enabled the call to
-	cal_factory_get_n_backends, so that we only terminate if there
-	are no active backends (either addressbook or calendar).
-
-2003-10-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: INCLUDE path fixes for changes made to libical
-	build.
-
-2003-08-13  JP Rosevear  <jpr@ximian.com>
-
-	* wombat.c (termination_handler): comment out some bits
-	(setup_pcs): register kind and method
-
-	* GNOME_Evolution_Wombat.server.in.in: add calendar protocol
-
-	* GNOME_Evolution_WombatLDAP.server.in.in: ditto
-
-2003-06-26  Rodrigo Moya <rodrigo@ximian.com>
-
-	* Evolution-Wombat.idl: removed WombatClient interface.
-
-	* Makefile.am: don't link libwombat in.
-
-2003-06-16  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* Makefile.am:
-	Add missing skel/stub to BUILD_SOURCES (bug #44717).
diff --git a/wombat/ChangeLog.pre-1-4 b/wombat/ChangeLog.pre-1-4
deleted file mode 100644
index ec653aec2a..0000000000
--- a/wombat/ChangeLog.pre-1-4
+++ /dev/null
@@ -1,484 +0,0 @@
-2003-04-07  Dan Winship  <danw@ximian.com>
-
-	* GNOME_Evolution_WombatLDAP.server.in.in: clean up server names
-
-	* GNOME_Evolution_WombatNOLDAP.server.in.in: Likewise
-
-2003-03-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* GNOME_Evolution_WombatLDAP.server.in.in: Add InterfaceCheck
-	object.
-	* GNOME_Evolution_WombatNOLDAP.server.in.in: Likewise.
-
-	* wombat-interface-check.c: New, from evolution-1-2-branch.
-	* wombat-interface-check.h: Likewise.
-
-	* wombat.c (setup_pas): Removed argc/argv args.
-	(setup_pcs): Likewise.
-	(setup_interface_check): New interface to set up the
-	InterfaceCheck object.
-	(main): Call the latter.
-
-2003-03-13  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (GNOME_Evolution_Wombat.server.in.in): Make this
-	depend on Makefile so it gets regenerated if you switch from
-	--without-openldap to --with-openldap
-
-2003-02-21  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (evolution_wombat_LDADD): cleanup
-
-2003-02-19  Chris Toshok  <toshok@ximian.com>
-
-	* wombat.c (termination_handler): gtk_main_quit =>
-	bonobo_main_quit.
-
-2003-02-07  Rodney Dawes  <dobey@ximian.com>
-
-	* Makefile.am: privlibexecdir not evolibexecdir for the server file
-	
-2003-02-06  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am: cleanup
-
-	* wombat.c (main): s/PACKAGE/GETTEXT_PACKAGE/ in gettext init
-
-2003-02-01  Hans Petter Jansson  <hpj@ximian.com>
-
-	* Makefile.am: Make .server file point to where wombat is now
-	installed.
-
-2003-01-29  Rodney Dawes  <dobey@ximian.com>
-
-	* Makefile.am: Install wombat to
-	$(libexecdir)/evolution/$(BASE_VERSION)
-	
-2003-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Rename wombat to evolution-wombat.
-	* GNOME_Evolution_WombatLDAP.server.in.in: Updated accordingly.
-	* GNOME_Evolution_WombatNOLDAP.server.in.in: Likewise.
-
-2003-01-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Do not dist the .server.in files; just dist the
-	.server.in.in ones.
-	(EXTRA_DIST): Add GNOME_Evolution_WombatLDAP.server.in.in and
-	GNOME_Evolution_WombatNOLDAP.server.in.in
-
-2003-01-06  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am: Remove idldir definition. It's defined in
-	configure.in now.
-
-2002-12-06  Hans Petter Jansson  <hpj@ximian.com>
-
-	* GNOME_Evolution_WombatNOLDAP.server.in.in: It appears that
-	Ettore's @LIBEXECDIR@ change didn't make it in for this file.
-	Fixed that.
-
-2002-11-16  Chris Toshok  <toshok@ximian.com>
-
-	* GNOME_Evolution_WombatLDAP.server.in.in: remove the moniker
-	cruft.
-
-	* GNOME_Evolution_WombatNOLDAP.server.in.in: same.
-	
-2002-11-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Added rule to create
-	GNOME_Evolution_Wombat.server.in from
-	GNOME_Evolution_Wombat.server.in.in, substituting @LIBEXECDIR@.
-	Also install wombat in $libexecdir instead of $bindir.
-
-	* GNOME_Evolution_WombatNOLDAP.server.in.in: Renamed from
-	GNOME_Evolution_WombatNOLDAP.server.in.  Changed the location from
-	"wombat" to "@LIBEXECDIR@/wombat".
-
-	* GNOME_Evolution_WombatLDAP.server.in.in: Renamed from
-	GNOME_Evolution_WombatLDAP.server.in.  Changed the location from
-	"wombat" to "@LIBEXECDIR@/wombat".
-
-2002-11-07  Rodrigo Moya <rodrigo@ximian.com>
-
-	* wombat.c: re-enabled calendar parts.
-
-2002-11-06  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (wombat_LDADD): remove libcamel.la from the link for
-	the time being.
-
-	* wombat.c: ifdef out (#ifdef PENDING_PORT_WORK) the calendar
-	stuff, since it doesn't link at the moment - undefined symbols in
-	pcs.  Also, include gtk.h so the gtk_* in the calendar portions
-	will still work.
-
-2002-11-05  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am: change over from .oaf files to .server files and
-	remove the moniker stuff from the build.
-
-	* wombat.c: port over to gnome2, and nuke all the config moniker
-	stuff.
-
-	* wombat-moniker.[ch]: remove
-
-	* wombat-private-moniker.[ch]: remove
-
-	* GNOME_Evolution_WombatLDAP.server.in: rename the oaf.in file to this.
-	
-	* GNOME_Evolution_WombatNOLDAP.server.in: rename the oaf.in file to this.
-
-	* .cvsignore: s/oaf/server
-	
-2002-08-01  Chris Toshok  <toshok@ximian.com>
-
-	* wombat.c (last_calendar_gone_cb): remove the annoying fprintf
-	about Queueing termination, since we never actually terminate.
-
-2002-07-25  Chris Toshok  <toshok@ximian.com>
-
-	* wombat.c (main): add a silly "up and running" message.
-
-2002-07-22  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (wombat_LDADD): Include libpcsfile.a, libpasfile.a
-	and (if ENABLE_LDAP) libpasldap.a
-
-2002-07-15  Peter Williams  <peterw@ximian.com>
-
-	* Makefile.am (EXTRA_DIST): Apparently we can't remove
-	$(idl_DATA) from $(EXTRA_DIST).
-
-2002-07-08  Peter Williams  <peterw@ximian.com>
-
-	* wombat.idl: Renamed to Evolution-Wombat.idl, since
-	we're installing it now and should play nice namespacily.
-	
-	* Makefile.am: Rename wombat.idl and install it.
-
-2002-04-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Removed dependency on libibex.
-
-2002-04-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Re-Add $(WOMBAT_LIBS) so wombat actually links.
-
-2002-04-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (wombat_LDADD): Put DB3_LDADD and LDAP_LIBS on the
-	top so the PAS backend uses the right version of DB3 and always
-	links to LDAP.
-
-2002-03-19  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (wombat_LDADD): s/libversit.la/libversit.a/
-
-2002-01-28  Radek Doulik  <rodo@ximian.com>
-
-	* Makefile.am (wombat_LDADD): added DB3_LDADD
-
-2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Use WOMBAT_LIBS and WOMBAT_CFLAGS.
-
-2001-10-29  Damon Chaplin  <damon@ximian.com>
-
-	* Makefile.am (wombat_LDADD): use libical-evolution.la
-
-2001-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* wombat.c (dump_backends): new function, ifdef'ed DEBUG_BACKENDS.
-	(main): add SIGUSR2 handler for dump_backends, ifdef'ed
-	DEBUG_BACKENDS.
-
-2001-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* wombat.c (main): Register the public ConfigDatabase interface
-	last to work around an OAF race condition.
-
-2001-10-11  Chris Toshok  <toshok@ximian.com>
-
-	* Makefile.am (wombat_SOURCES): add wombat-private-moniker.[ch].
-
-	* GNOME_Evolution_WombatLDAP.oaf.in: add wombat-private
-	factory/moniker.
-
-	* GNOME_Evolution_WombatNOLDAP.oaf.in: same.
-
-	* wombat-private-moniker.[ch]: xmldb for private database -- non
-	configuration settings, basically.
-
-2001-10-02  Chris Toshok  <toshok@ximian.com>
-
-	* GNOME_Evolution_WombatNOLDAP.oaf.in: add
-	addressbook:supported_protocols containing just the file protocol.
-
-	* GNOME_Evolution_WombatLDAP.oaf.in: add
-	addressbook:supported_protocols containing both ldap and file.
-
-	* Makefile.am (OAF_IN_FILE): we have to possible files now, since
-	the addressbook looks up factories by corba interface and the
-	protocols supported by the factory (as listed in the .oaf file.)
-
-	* .cvsignore: ignore GNOME_Evolution_Wombat.oaf.in, since it's
-	generated now.
-	
-2001-09-26  Chris Toshok  <toshok@ximian.com>
-
-	* wombat.c (setup_pas): add OAFIID parameter to the call to the
-	pas_book_factory_activate function, as with the calendar stuff.
-
-2001-09-19  Rodrigo Moya <rodrigo@ximian.com>
-
-	* wombat.c (setup_pcs): add OAFIID parameter to the call to the
-	cal_factory_oaf_register function
-
-2001-08-02  Jon Trowbridge  <trow@ximian.com>
-
-	* Makefile.am: Added camel dependency (now needed by ebook).
-
-2001-07-10  Peter Williams  <peterw@ximian.com>
-
-	* Makefile.am (EXTRA_DIST): Distribute wombat.idl.
-
-2001-06-24  Federico Mena Quintero  <federico@ximian.com>
-
-	* wombat.c (main): Shut down gnome-vfs.
-
-2001-06-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am (wombat_LDADD): Added libwombat/libwombat.la
-
-2001-06-21  Rodrigo Moya <rodrigo@ximian.com>
-
-	* wombat.idl: added new interface (WombatClient)
-
-2001-06-18  Dan Winship  <danw@ximian.com>
-
-	* Makefile.am (wombat_LDADD): Add libedb3util
-
-2001-06-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (wombat_LDADD): Move `$(DB3_LDADD)' before libeutil.
-
-2001-05-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am (wombat_LDADD): Added db3 libs.
-
-2001-04-03  Dietmar Maurer  <dietmar@ximian.com>
-
-	* wombat-moniker.c (wombat_lookup_db): fix ref. counting problem
-
-2001-03-27  Dietmar Maurer  <dietmar@ximian.com>
-
-	* wombat-moniker.c (wombat_moniker_resolve): we can now resolve to
-	storages and streams.
-
-2001-03-26  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* wombat.c: Replace <gnome.h> <and <bonobo.h> includes
-	and add <stdlib.h> to remove warnings from newer gcc.
-	
-2001-03-21  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: add wombat-moniker.h as a source so it gets disted
-
-2001-03-21  Dietmar Maurer  <dietmar@ximian.com>
-
-	* wombat.c (setup_config): initialise the moniker factory
-
-	* GNOME_Evolution_Wombat.oaf.in: added the necessary entries for
-	the wombat moniker.
-
-	* wombat-moniker.[ch]: wombat is now a moniker 
-
-2001-03-15  Jon Trowbridge  <trow@ximian.com>
-
-	* wombat.c (main): If we can't initialize a service on startup,
-	tell us which one before terminating.
-
-2001-02-27  Federico Mena Quintero  <federico@ximian.com>
-
-	* wombat.c (init_corba): Use VERSION and the Wombat description
-	for gnome_init_with_popt_table().
-
-2001-02-16  Federico Mena Quintero  <federico@ximian.com>
-
-	* wombat.c (main): Unref the factories if we failed to initialize
-	anything.
-	(setup_pcs): Call cal_factory_oaf_register().  Removed the OAF
-	registration code from here; now it is in the CalFactory itself.
-
-2001-02-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* Makefile.am: xml-i18n-tools setup.
-	* GNOME_Evolution_Wombat.oaf.in: Mark strings for translation.
-	
-2001-02-08  JP Rosevear  <jpr@ximian.com>
-
-	* Makefile.am: Remove useless ldflags
-
-2001-01-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* wombat.c (setup_pcs): Return a success value.
-	(setup_pas): Likewise.
-	(setup_config): Likewise.
-	(main): Exit if we could not initialize all of the Wombat
-	services.
-	(init_corba): Check the return value of gnome_init_with_popt_table().
-	(main): Call bindtextdomain() and textdomain().
-
-2000-12-23  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (INCLUDES): Add `-I$(top_builddir)/calendar/pcs' for
-	builddir compliance.
-
-2000-12-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (INCLUDES): Sigh.
-	`-I$(top_builddir)/libical/src/libical'.
-
-2000-12-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am (wombat_LDADD): Link to the libical shared library.
-
-2000-11-11  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* wombat.oafinfo:
-	Update the remaining "IDL:Evolution*" to "IDL:GNOME/Evolution*"
-	to sync up with yesterday's IDL re-scoping.
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR
-
-2000-09-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am (INCLUDES): Add the libical include path.
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* Makefile.am: ename moved so link against
-	e-util/ename/libename.la
-
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* Makefile.am: Remove gnorba related code 
-
-	* wombat.c: Remove gnorba related code
-
-	* wombat.gnorba: Kill
-
-2000-08-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am (wombat_LDADD): Reorder libical libs.
-
-2000-08-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* wombat.c (setup_pcs): Register the iCalendar file backend instad
-	of the old IMC backend.
-
-2000-05-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (INCLUDES): GNOME includes should come last, so that
-	we are sure we pick our own includes instead of the installed
-	ones, if any.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added an include for the pcs directory.
-
-2000-05-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* wombat.c (setup_pcs): Register the "file" method with the IMC
-	backend.
-
-2000-05-05  Chris Toshok <toshok@helixcode.com>
-	* .cvsignore: ignore wombat.pure
-
-	* Makefile.am: add support for building wombat.pure
-
-2000-05-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* wombat.c (main): Doh, also unref the pas_book_factory when we
-	are done.
-
-2000-04-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* wombat.c (setup_pas): Connect to the "last_book_gone" signal of
-	the book factory.
-	(last_book_gone_cb): Handle the "last_book_gone" signal.
-	(termination_handler): Check if the book factory has zero running
-	backends.
-
-2000-04-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added ename libs to LDADD. 
-
-2000-04-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* wombat.c
-	(register_pcs): New function for registering into the name
-	service.  Varies according on whether we are `USING_OAF' or not.
-	(init_corba): New function for initializing the CORBA stuff.
-	Implementation depends on `USING_OAF'.
-	(init_bonobo): Use `init_corba'.
-
-	* Makefile.am: Updated for OAF.
-
-2000-04-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* wombat.c (cal_factory pas_book_factory): New module-wide
-	variables for the PAS and PCS factories.
-	(setup_pcs): Connect to the "last_calendar_gone" signal of the
-	calendar factory.
-	(last_calendar_gone_cb): Queue a termination job.
-	(queue_termination): Function to queue a termination job.  We have
-	to use a timeout to reduce the probability of running into GOAD's
-	race condition with factories.
-	(termination_handler): Check that the PCS and the PAS have zero
-	backends.  If so, exit the main loop.
-	(setup_vfs): Use EXIT_FAILURE instead of 1.
-	(init_bonobo): Likewise.
-	(main): Destroy the factories and exit Wombat.  Wheee!
-
-2000-04-16  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am (INCLUDES): Removed spurious calendar directories
-	from the include path.  Added "wombat" log domain for glib.
-	(wombat_LDADD): Link libpcs.a instead of the old shared library.
-
-	* wombat.c: cal-factory.h is an internal include file.  * wombat.c
-	(setup_pcs): We should NOT share a CORBA_environment across all
-	functions!  Use our own CORBA_environment.
-	(init_bonobo): Use our own CORBA_environment.  Free the exception
-	after initializing GOAD, and present some error messages if
-	necessary.  (Should g_message()s for exceptional situations be
-	marked for translation?).
-
-2000-04-15  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (INCLUDES): Added
-	`-I$(top_builddir)/addressbook/backend/pas', and
-	`-I$(top_builddir)/calendar/pcs' because that's where the
-	IDL-generated files go.
-
-2000-04-14  Chris Toshok  <toshok@helixcode.com>
-
-	* Makefile.am (wombat_LDADD): use BONOBO_VFS_GNOME_LIBS instead of
-	BONOBO_HTML_GNOME_LIBS.  fixes freebsd's problem running wombat.
-
-2000-04-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* wombat.c (setup_pcs): Must pass "object" for the kind to
-	goad_server_register(); "server" is meaningless.
-	(setup_pcs): Do not free the CORBA environment more than once.
-	Also, fix error messages.
-
-	* wombat.gnorba: The GOAD ID is "evolution:calendar-factory", not
-	"evolution:calendar-server".
-
-	* ChangeLog: Started the ChangeLog for Wombat.
diff --git a/wombat/Evolution-Wombat.idl b/wombat/Evolution-Wombat.idl
deleted file mode 100644
index 3f25693599..0000000000
--- a/wombat/Evolution-Wombat.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Wombat interfaces.
- *
- * Copyright (C) 2000, 2001, 2002, Ximian, Inc.
- */
-
-#include <Bonobo.idl>
-
-module GNOME {
-module Evolution {
-
-	interface Config {
-	};
-
-	interface WombatInterfaceCheck : Bonobo::Unknown {
-		readonly attribute string interfaceVersion;
-	};
-};
-};
diff --git a/wombat/GNOME_Evolution_WombatLDAP.server.in.in b/wombat/GNOME_Evolution_WombatLDAP.server.in.in
deleted file mode 100644
index b82fe26803..0000000000
--- a/wombat/GNOME_Evolution_WombatLDAP.server.in.in
+++ /dev/null
@@ -1,50 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_ServerFactory"
-            type="exe"
-            location="@LIBEXECDIR@/evolution-wombat">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/BookFactory:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-                       _value="Evolution Addressbook local/LDAP backend"/>
-
-        <oaf_attribute name="addressbook:supported_protocols" type="stringv">
-		<item value="ldap"/>
-		<item value="file"/>
-		<item value="vcf"/>
-        </oaf_attribute>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_CalendarFactory"
-            type="exe"
-            location="@LIBEXECDIR@/evolution-wombat">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Calendar/CalFactory:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-                       _value="Evolution Calendar local file backend"/>
-
-        <oaf_attribute name="calendar:supported_protocols" type="stringv">
-		<item value="file"/>
-        </oaf_attribute>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_InterfaceCheck"
-            type="exe"
-            location="@LIBEXECDIR@/evolution-wombat">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/WombatInterfaceCheck:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-
-</oaf_server>
-
-</oaf_info>
diff --git a/wombat/GNOME_Evolution_WombatNOLDAP.server.in.in b/wombat/GNOME_Evolution_WombatNOLDAP.server.in.in
deleted file mode 100644
index 84a460db99..0000000000
--- a/wombat/GNOME_Evolution_WombatNOLDAP.server.in.in
+++ /dev/null
@@ -1,49 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_ServerFactory"
-            type="exe"
-            location="@LIBEXECDIR@/evolution-wombat">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/BookFactory:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-                       _value="Evolution Addressbook local backend"/>
-
-        <oaf_attribute name="addressbook:supported_protocols" type="stringv">
-		<item value="file"/>
-		<item value="vcf"/>
-        </oaf_attribute>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_CalendarFactory"
-            type="exe"
-            location="@LIBEXECDIR@/evolution-wombat">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Calendar/CalFactory:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-                       _value="Evolution Calendar local file backend"/>
-
-        <oaf_attribute name="calendar:supported_protocols" type="stringv">
-		<item value="file"/>
-        </oaf_attribute>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_InterfaceCheck"
-            type="exe"
-            location="@LIBEXECDIR@/evolution-wombat">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/WombatInterfaceCheck:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-
-</oaf_server>
-
-</oaf_info>
diff --git a/wombat/Makefile.am b/wombat/Makefile.am
deleted file mode 100644
index 7caa352d14..0000000000
--- a/wombat/Makefile.am
+++ /dev/null
@@ -1,97 +0,0 @@
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"wombat\"			\
-	-DPREFIX=\"$(prefix)\"				\
-	-DSYSCONFDIR=\"$(sysconfdir)\"			\
-	-DDATADIR=\"$(datadir)\"			\
-	-DLIBDIR=\"$(libdir)\"				\
-	-I$(top_srcdir)/e-util				\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/backend		\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_builddir)/calendar			\
-	-I$(top_srcdir)/libical/src			\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
-	$(WOMBAT_CFLAGS)
-
-IDLS = \
-	Evolution-Wombat.idl
-
-IDL_GENERATED_H = \
-	Evolution-Wombat.h
-
-IDL_GENERATED_C =				\
-	Evolution-Wombat-common.c		\
-	Evolution-Wombat-skels.c		\
-	Evolution-Wombat-stubs.c
-
-IDL_GENERATED = $(IDL_GENERATED_H) $(IDL_GENERATED_C)
-
-$(IDL_GENERATED_H): $(IDLS)
-	$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) $(srcdir)/Evolution-Wombat.idl
-
-$(IDL_GENERATED_C): $(IDL_GENERATED_H)
-
-
-privlibexec_PROGRAMS =	\
-	evolution-wombat
-
-evolution_wombat_SOURCES = \
-	$(IDL_GENERATED)		\
-	wombat-interface-check.c	\
-	wombat-interface-check.h	\
-	wombat.c
-
-if ENABLE_LDAP
-LDAP_BACKEND = $(top_builddir)/addressbook/backend/pas/libpasldap.la
-endif
-
-evolution_wombat_LDADD =						\
-	$(top_builddir)/addressbook/backend/pas/libpasfile.la		\
-	$(top_builddir)/addressbook/backend/pas/libpasvcf.la		\
-	$(LDAP_BACKEND)							\
-	$(top_builddir)/calendar/pcs/libpcsfile.la			\
-	$(top_builddir)/calendar/pcs/libpcshttp.la			\
-	$(WOMBAT_LIBS)
-
-if ENABLE_LDAP
-SERVER_IN_FILE=GNOME_Evolution_WombatLDAP.server.in.in
-else
-SERVER_IN_FILE=GNOME_Evolution_WombatNOLDAP.server.in.in
-endif
-
-GNOME_Evolution_Wombat.server.in.in: $(SERVER_IN_FILE) Makefile
-	cp $< $@
-
-server_in_files = GNOME_Evolution_Wombat.server.in.in
-server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
-@EVO_SUBST_SERVER_RULE@
-@EVO_NAME_SERVER_RULE@
-@INTLTOOL_SERVER_RULE@
-
-idl_DATA = $(IDLS)
-
-EXTRA_DIST = 						\
-	$(server_in_files)				\
-	$(idl_DATA)					\
-	ChangeLog.pre-1-4				\
-	GNOME_Evolution_WombatLDAP.server.in.in		\
-	GNOME_Evolution_WombatNOLDAP.server.in.in
-
-BUILT_SOURCES = $(IDL_GENERATED) $(server_DATA)
-CLEANFILES = $(BUILT_SOURCES)
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
-
-if ENABLE_PURIFY
-PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-
-all-local: evolution-wombat.pure
-
-evolution-wombat.pure: evolution-wombat
-	@rm -f evolution-wombat.pure
-	$(PLINK) $(evolution_wombat_LDFLAGS) $(evolution_wombat_OBJECTS) $(evolution_wombat_LDADD) $(LIBS)
-
-endif
diff --git a/wombat/wombat-interface-check.c b/wombat/wombat-interface-check.c
deleted file mode 100644
index f7766cd218..0000000000
--- a/wombat/wombat-interface-check.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* wombat-interface-check.c
- *
- * Copyright (C) 2002  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli <ettore@ximian.com>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "wombat-interface-check.h"
-
-#include <gal/util/e-util.h>
-
-
-#define PARENT_TYPE bonobo_object_get_type ()
-static BonoboObjectClass *parent_class = NULL;
-
-
-static CORBA_char *
-impl__get_interfaceVersion (PortableServer_Servant servant,
-			    CORBA_Environment *ev)
-{
-	return CORBA_string_dup (VERSION);
-}
-
-
-static void
-wombat_interface_check_class_init (WombatInterfaceCheckClass *class)
-{
-	parent_class = g_type_class_ref (PARENT_TYPE);
-
-	class->epv._get_interfaceVersion = impl__get_interfaceVersion;
-}
-
-static void
-wombat_interface_check_init (WombatInterfaceCheck *interface_check)
-{
-	/* (Nothing to initialize here.)  */
-}
-
-
-WombatInterfaceCheck *
-wombat_interface_check_new (void)
-{
-	return g_object_new (WOMBAT_TYPE_INTERFACE_CHECK, NULL);
-}
-
-
-BONOBO_TYPE_FUNC_FULL (WombatInterfaceCheck,
-		       GNOME_Evolution_WombatInterfaceCheck,
-		       PARENT_TYPE,
-		       wombat_interface_check)
diff --git a/wombat/wombat-interface-check.h b/wombat/wombat-interface-check.h
deleted file mode 100644
index 9cd00b5b62..0000000000
--- a/wombat/wombat-interface-check.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* wombat-interface-check.h
- *
- * Copyright (C) 2002  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli <ettore@ximian.com>
- */
-
-#ifndef _WOMBAT_INTERFACE_CHECK_H_
-#define _WOMBAT_INTERFACE_CHECK_H_
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo/bonobo-object.h>
-#include "Evolution-Wombat.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define WOMBAT_TYPE_INTERFACE_CHECK		(wombat_interface_check_get_type ())
-#define WOMBAT_INTERFACE_CHECK(obj)		(GTK_CHECK_CAST ((obj), WOMBAT_TYPE_INTERFACE_CHECK, WombatInterfaceCheck))
-#define WOMBAT_INTERFACE_CHECK_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), WOMBAT_TYPE_INTERFACE_CHECK, WombatInterfaceCheckClass))
-#define WOMBAT_IS_INTERFACE_CHECK(obj)		(GTK_CHECK_TYPE ((obj), WOMBAT_TYPE_INTERFACE_CHECK))
-#define WOMBAT_IS_INTERFACE_CHECK_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), WOMBAT_TYPE_INTERFACE_CHECK))
-
-
-typedef struct _WombatInterfaceCheck        WombatInterfaceCheck;
-typedef struct _WombatInterfaceCheckPrivate WombatInterfaceCheckPrivate;
-typedef struct _WombatInterfaceCheckClass   WombatInterfaceCheckClass;
-
-struct _WombatInterfaceCheck {
-	BonoboObject parent;
-};
-
-struct _WombatInterfaceCheckClass {
-	BonoboObjectClass parent_class;
-
-	POA_GNOME_Evolution_WombatInterfaceCheck__epv epv;
-};
-
-
-GType wombat_interface_check_get_type  (void);
-WombatInterfaceCheck *wombat_interface_check_new (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _WOMBAT_INTERFACE_CHECK_H_ */
diff --git a/wombat/wombat.c b/wombat/wombat.c
deleted file mode 100644
index 64b9c47677..0000000000
--- a/wombat/wombat.c
+++ /dev/null
@@ -1,262 +0,0 @@
-/* Wombat personal information server - main file
- *
- * Author: Nat Friedman <nat@ximian.com>
- *
- * Copyright 2000, Ximian, Inc.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-/* define this if you need/want to be able to send USR2 to wombat and
-   get a list of the active backends */
-/*#define DEBUG_BACKENDS*/
-
-#include <stdlib.h>
-#ifdef DEBUG_BACKENDS
-#include <sys/signal.h>
-#endif
-
-#include <glib.h>
-#include <libgnome/gnome-init.h>
-#include <bonobo-activation/bonobo-activation.h>
-#include <libgnomevfs/gnome-vfs-init.h>
-#include <bonobo/bonobo-main.h>
-#include <bonobo/bonobo-i18n.h>
-#include <bonobo/bonobo-exception.h>
-#include <bonobo/bonobo-generic-factory.h>
-
-#include "pas/pas-book-factory.h"
-#include "pas/pas-backend-file.h"
-#include "pas/pas-backend-vcf.h"
-#ifdef HAVE_LDAP
-#include "pas/pas-backend-ldap.h"
-#endif
-
-#include "calendar/pcs/cal-factory.h"
-#include "calendar/pcs/cal-backend-file-events.h"
-#include "calendar/pcs/cal-backend-file-todos.h"
-#include "calendar/pcs/cal-backend-http.h"
-
-#include "wombat-interface-check.h"
-
-#define CAL_FACTORY_OAF_ID "OAFIID:GNOME_Evolution_Wombat_CalendarFactory"
-#define PAS_BOOK_FACTORY_OAF_ID "OAFIID:GNOME_Evolution_Wombat_ServerFactory"
-
-/* The and addressbook calendar factories */
-
-static CalFactory *cal_factory;
-
-static PASBookFactory *pas_book_factory;
-
-/* Timeout interval in milliseconds for termination */
-#define EXIT_TIMEOUT 5000
-
-/* Timeout ID for termination handler */
-static guint termination_handler_id;
-
-
-
-/* Termination */
-
-/* Termination handler.  Checks if both factories have zero running backends,
- * and if so terminates the program.
- */
-static gboolean
-termination_handler (gpointer data)
-{
-	if (cal_factory_get_n_backends (cal_factory) == 0 &&
-	    pas_book_factory_get_n_backends (pas_book_factory) == 0) {
-		fprintf (stderr, "termination_handler(): Terminating the Wombat.  Have a nice day.\n");
-		bonobo_main_quit ();
-	}
-
-	termination_handler_id = 0;
-	return FALSE;
-}
-
-/* Queues a timeout for handling termination of Wombat */
-static void
-queue_termination (void)
-{
-	if (termination_handler_id)
-		return;
-
-	termination_handler_id = g_timeout_add (EXIT_TIMEOUT, termination_handler, NULL);
-}
-
-
-
-static void
-last_book_gone_cb (PASBookFactory *factory, gpointer data)
-{
-	queue_termination ();
-}
-
-static gboolean
-setup_pas (void)
-{
-	pas_book_factory = pas_book_factory_new ();
-
-	if (!pas_book_factory)
-		return FALSE;
-
-	pas_book_factory_register_backend (
-		pas_book_factory, "file", pas_backend_file_new);
-
-	pas_book_factory_register_backend (
-		pas_book_factory, "vcf", pas_backend_vcf_new);
-
-#ifdef HAVE_LDAP
-	pas_book_factory_register_backend (
-		pas_book_factory, "ldap", pas_backend_ldap_new);
-#endif
-
-	g_signal_connect (pas_book_factory,
-			  "last_book_gone",
-			  G_CALLBACK (last_book_gone_cb),
-			  NULL);
-
-	if (!pas_book_factory_activate (pas_book_factory, PAS_BOOK_FACTORY_OAF_ID)) {
-		bonobo_object_unref (BONOBO_OBJECT (pas_book_factory));
-		pas_book_factory = NULL;
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-
-/* Personal calendar server */
-
-/* Callback used when the calendar factory has no more running backends */
-static void
-last_calendar_gone_cb (CalFactory *factory, gpointer data)
-{
-	queue_termination ();
-}
-
-/* Creates the calendar factory object and registers it */
-static gboolean
-setup_pcs (void)
-{
-	cal_factory = cal_factory_new ();
-
-	if (!cal_factory) {
-		g_message ("setup_pcs(): Could not create the calendar factory");
-		return FALSE;
-	}
-
-	cal_factory_register_method (cal_factory, "file", ICAL_VEVENT_COMPONENT, CAL_BACKEND_FILE_EVENTS_TYPE);
-	cal_factory_register_method (cal_factory, "file", ICAL_VTODO_COMPONENT, CAL_BACKEND_FILE_TODOS_TYPE);
-	cal_factory_register_method (cal_factory, "webcal", ICAL_VEVENT_COMPONENT, CAL_BACKEND_HTTP_TYPE);
-
-	if (!cal_factory_register_storage (cal_factory, CAL_FACTORY_OAF_ID)) {
-		bonobo_object_unref (BONOBO_OBJECT (cal_factory));
-		cal_factory = NULL;
-		return FALSE;
-	}
-
-	g_signal_connect (G_OBJECT (cal_factory),
-			  "last_calendar_gone",
-			  G_CALLBACK (last_calendar_gone_cb),
-			  NULL);
-
-	return TRUE;
-}
-
-
-/* Interface check iface.  */
-
-static gboolean
-setup_interface_check (void)
-{
-	WombatInterfaceCheck *interface_check_iface = wombat_interface_check_new ();
-	int result;
-
-	result = bonobo_activation_active_server_register ("OAFIID:GNOME_Evolution_Wombat_InterfaceCheck",
-							   BONOBO_OBJREF (interface_check_iface));
-
-	return result == Bonobo_ACTIVATION_REG_SUCCESS;
-}
-
-
-
-#ifdef DEBUG_BACKENDS
-static void
-dump_backends (int signal)
-{
-	pas_book_factory_dump_active_backends (pas_book_factory);
-	cal_factory_dump_active_backends (cal_factory);
-}
-#endif
-
-int
-main (int argc, char **argv)
-{
-	gboolean did_pas=FALSE, did_pcs=FALSE;
-
-	bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
-
-	g_message ("Starting wombat");
-
-#ifdef DEBUG_BACKENDS
-	signal (SIGUSR2, dump_backends);
-#endif
-
-       	gnome_program_init ("Wombat", VERSION,
-			    LIBGNOME_MODULE,
-			    argc, argv,
-			    GNOME_PROGRAM_STANDARD_PROPERTIES, NULL);
-
-	bonobo_init_full (&argc, argv,
-			  bonobo_activation_orb_get(),
-			  CORBA_OBJECT_NIL,
-			  CORBA_OBJECT_NIL);
-
-	if (!( (did_pas = setup_pas ())
-	       && (did_pcs = setup_pcs ())
-		    )) {
-
-		const gchar *failed = NULL;
-
-		if (!did_pas)
-			failed = "PAS";
-		else if (!did_pcs)
-			failed = "PCS";
-
-		g_message ("main(): could not initialize Wombat service \"%s\"; terminating", failed);
-
-		if (pas_book_factory) {
-			bonobo_object_unref (BONOBO_OBJECT (pas_book_factory));
-			pas_book_factory = NULL;
-		}
-
-		if (cal_factory) {
-			bonobo_object_unref (BONOBO_OBJECT (cal_factory));
-			cal_factory = NULL;
-		}
-		exit (EXIT_FAILURE);
-	}
-
-	if (! setup_interface_check ()) {
-		g_message ("Cannot register Wombat::InterfaceCheck object");
-		exit (EXIT_FAILURE);
-	}
-
-	g_print ("Wombat up and running\n");
-
-	bonobo_main ();
-
-	bonobo_object_unref (BONOBO_OBJECT (cal_factory));
-	cal_factory = NULL;
-
-	bonobo_object_unref (BONOBO_OBJECT (pas_book_factory));
-	pas_book_factory = NULL;
-
-	gnome_vfs_shutdown ();
-
-	return 0;
-}