This commit was manufactured by cvs2svn to create tag 'EOG_0_3'.EOG_0_3

svn path=/tags/EOG_0_3/; revision=2496

6 files changed, 0 insertions, 248 deletions

diff --git a/wombat/.cvsignore b/wombat/.cvsignore
deleted file mode 100644
index e321f442a5..0000000000
--- a/wombat/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
-wombat-stubs.c
-wombat-skels.c
-wombat-common.c
-wombat.h
-wombat
diff --git a/wombat/ChangeLog b/wombat/ChangeLog
deleted file mode 100644
index 3a0d938fb6..0000000000
--- a/wombat/ChangeLog
+++ /dev/null
@@ -1,37 +0,0 @@
-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/Makefile.am b/wombat/Makefile.am
deleted file mode 100644
index f4bbf1a87c..0000000000
--- a/wombat/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-INCLUDES =						\
-	$(EXTRA_GNOME_CFLAGS)				\
-	$(GNOME_INCLUDEDIR)				\
-	-DG_LOG_DOMAIN=\"wombat\"			\
-	-I$(top_srcdir)/e-util				\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/addressbook/backend/pas		\
-	-I$(top_builddir)/addressbook/backend/pas	\
-	-I$(top_srcdir)/calendar			\
-	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"
-
-bin_PROGRAMS =	\
-	wombat
-
-wombat_SOURCES = 	\
-	wombat.c
-
-wombat_LDADD =							\
-	$(EXTRA_GNOME_LIBS)					\
-	$(BONOBO_VFS_GNOME_LIBS)				\
-	$(top_builddir)/addressbook/backend/pas/libpas.la	\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
-	$(top_builddir)/calendar/pcs/libpcs.a			\
-	$(top_builddir)/libical/src/libical/libical.la		\
-	$(top_builddir)/calendar/cal-util/libcal-util.la	\
-	$(top_builddir)/libversit/libversit.la			\
-	$(top_builddir)/e-util/libeutil.la			\
-	-lgnomevfs						\
-	$(LDAP_LIBS)
-
-wombat_LDFLAGS = `gnome-config --libs gnorba` 
-
-gnorbadir = $(sysconfdir)/CORBA/servers
-gnorba_DATA = wombat.gnorba
diff --git a/wombat/wombat.c b/wombat/wombat.c
deleted file mode 100644
index 1d703e3833..0000000000
--- a/wombat/wombat.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Wombat personal information server - main file
- *
- * Author: Nat Friedman <nat@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#include <config.h>
-#include <bonobo.h>
-#include <pas-book-factory.h>
-#include <pas-backend-file.h>
-#ifdef HAVE_LDAP
-#include <pas-backend-ldap.h>
-#endif
-#include <libgnomevfs/gnome-vfs-init.h>
-#include <libgnorba/gnorba.h>
-#include "calendar/pcs/cal-factory.h"
-
-CORBA_ORB orb;
-
-static void
-setup_pas (int argc, char **argv)
-{
-	static PASBookFactory *factory;
-
-	factory = pas_book_factory_new ();
-
-	pas_book_factory_register_backend (
-		factory, "file", pas_backend_file_new);
-
-#ifdef HAVE_LDAP
-	pas_book_factory_register_backend (
-		factory, "ldap", pas_backend_ldap_new);
-#endif
-
-	pas_book_factory_activate (factory);
-}
-
-/* Creates the calendar factory object and registers it with GOAD */
-static void
-setup_pcs (int argc, char **argv)
-{
-	CalFactory *factory;
-	CORBA_Object object;
-	CORBA_Environment ev;
-	int result;
-
-	factory = cal_factory_new ();
-
-	if (!factory) {
-		g_message ("setup_pcs(): Could not create the calendar factory");
-		return;
-	}
-
-	object = bonobo_object_corba_objref (BONOBO_OBJECT (factory));
-
-	CORBA_exception_init (&ev);
-	result = goad_server_register (CORBA_OBJECT_NIL,
-				       object,
-				       "evolution:calendar-factory",
-				       "object",
-				       &ev);
-
-	/* FIXME: should Wombat die if it gets errors here? */
-
-	if (ev._major != CORBA_NO_EXCEPTION || result == -1) {
-		g_message ("setup_pcs(): could not register the calendar factory");
-		bonobo_object_unref (BONOBO_OBJECT (factory));
-		CORBA_exception_free (&ev);
-		return;
-	} else if (result == -2) {
-		g_message ("setup_pcs(): a calendar factory is already registered");
-		bonobo_object_unref (BONOBO_OBJECT (factory));
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	/* FIXME: we never connect to the destroy signal of the factory.  We
-	 * need to add a signal to it to indicate that the last client died.
-	 * The PAS factory needs to have the same thing.  When Wombat sees that
-	 * both factories have lost all their clients, it should destroy the
-	 * factories and terminate.  */
-
-	CORBA_exception_free (&ev);
-}
-
-static void
-setup_config (int argc, char **argv)
-{
-}
-
-static void
-setup_vfs (int argc, char **argv)
-{
-	if (!gnome_vfs_init ()) {
-		g_message ("setup_vfs(): could not initialize GNOME-VFS");
-		exit (1);
-	}
-}
-
-
-static void
-init_bonobo (int argc, char **argv)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	gnome_CORBA_init_with_popt_table (
-		"Personal Addressbook Server", "0.0",
-		&argc, argv, NULL, 0, NULL, GNORBA_INIT_SERVER_FUNC, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("init_bonobo(): could not initialize GOAD");
-		CORBA_exception_free (&ev);
-		exit (1);
-	}
-
-	CORBA_exception_free (&ev);
-
-	orb = gnome_CORBA_ORB ();
-
-	if (!bonobo_init (orb, NULL, NULL)) {
-		g_message ("init_bonobo(): could not initialize Bonobo");
-		exit (1);
-	}
-}
-
-int
-main (int argc, char **argv)
-{
-	init_bonobo  (argc, argv);
-	setup_vfs    (argc, argv);
-
-	setup_pas    (argc, argv);
-	setup_pcs    (argc, argv);
-	setup_config (argc, argv);
-
-	bonobo_main  ();
-
-	return 0;
-}
diff --git a/wombat/wombat.gnorba b/wombat/wombat.gnorba
deleted file mode 100644
index d170bebc15..0000000000
--- a/wombat/wombat.gnorba
+++ /dev/null
@@ -1,11 +0,0 @@
-[evolution:addressbook-server]
-type=exe
-repo_id=IDL:Evolution/BookFactory:1.0 IDL:Bonobo/Unknown:1.0
-description=The Personal Addressbook Server
-location_info=wombat
-
-[evolution:calendar-factory]
-type=exe
-repo_id=IDL:Evolution/Calendar/CalFactory:1.0 IDL:Bonobo/Unknown:1.0
-description=The Personal Calendar Server; calendar factory
-location_info=wombat
diff --git a/wombat/wombat.idl b/wombat/wombat.idl
deleted file mode 100644
index ab13b2cabf..0000000000
--- a/wombat/wombat.idl
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * The Evolution Personal Organization Server.
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-module Evolution {
-
-	interface Config {
-
-	};
-};