Made Evolution OAF-compatible.

svn path=/trunk/; revision=2673

6 files changed, 206 insertions, 31 deletions

diff --git a/wombat/ChangeLog b/wombat/ChangeLog
index 704b27d1b6..150aa26e46 100644
--- a/wombat/ChangeLog
+++ b/wombat/ChangeLog
@@ -1,3 +1,14 @@
+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
diff --git a/wombat/GNOME_Evolution_Wombat.oaf.in b/wombat/GNOME_Evolution_Wombat.oaf.in
new file mode 100644
index 0000000000..1109cc0df6
--- /dev/null
+++ b/wombat/GNOME_Evolution_Wombat.oaf.in
@@ -0,0 +1,30 @@
+<oaf_info>
+
+<oaf_server iid="OAFIID:evolution:addressbook-server:0fbc844d-c721-4615-98d0-d67eacf42d80"
+            type="exe"
+            location="wombat">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:Evolution/BookFactory:1.0"/>
+		<item value="IDL:Bonobo/Unknown:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+                       value="The Personal Addressbook Server"/>
+</oaf_server>
+
+<oaf_server iid="OAFIID:evolution:calendar-factory:1c915858-ece3-4a6f-9d81-ea0f108a9554"
+            type="exe"
+            location="wombat">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:Evolution/Calendar/CalFactory:1.0"/>
+		<item value="IDL:Bonobo/Unknown:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+                       value="The Personal Calendar Server; calendar factory"/>
+
+</oaf_server>
+
+</oaf_info>
diff --git a/wombat/GNOME_Evolution_Wombat.oafinfo b/wombat/GNOME_Evolution_Wombat.oafinfo
new file mode 100644
index 0000000000..1109cc0df6
--- /dev/null
+++ b/wombat/GNOME_Evolution_Wombat.oafinfo
@@ -0,0 +1,30 @@
+<oaf_info>
+
+<oaf_server iid="OAFIID:evolution:addressbook-server:0fbc844d-c721-4615-98d0-d67eacf42d80"
+            type="exe"
+            location="wombat">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:Evolution/BookFactory:1.0"/>
+		<item value="IDL:Bonobo/Unknown:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+                       value="The Personal Addressbook Server"/>
+</oaf_server>
+
+<oaf_server iid="OAFIID:evolution:calendar-factory:1c915858-ece3-4a6f-9d81-ea0f108a9554"
+            type="exe"
+            location="wombat">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:Evolution/Calendar/CalFactory:1.0"/>
+		<item value="IDL:Bonobo/Unknown:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+                       value="The Personal Calendar Server; calendar factory"/>
+
+</oaf_server>
+
+</oaf_info>
diff --git a/wombat/Makefile.am b/wombat/Makefile.am
index 0c690991f6..94118eef9c 100644
--- a/wombat/Makefile.am
+++ b/wombat/Makefile.am
@@ -31,5 +31,14 @@ wombat_LDADD =							\
 
 wombat_LDFLAGS = `gnome-config --libs gnorba` 
 
+if USING_OAF
+oafdir = $(datadir)/oaf
+oaf_DATA = wombat.oafinfo
+else
 gnorbadir = $(sysconfdir)/CORBA/servers
 gnorba_DATA = wombat.gnorba
+endif
+
+EXTRA_DIST =		\
+	wombat.gnorba	\
+	wombat.oafinfo
diff --git a/wombat/wombat.c b/wombat/wombat.c
index 6ced8d2682..43ee72d886 100644
--- a/wombat/wombat.c
+++ b/wombat/wombat.c
@@ -9,16 +9,13 @@
 #include <bonobo.h>
 #include <pas/pas-book-factory.h>
 #include <pas/pas-backend-file.h>
+#include <libgnomevfs/gnome-vfs-init.h>
+
 #ifdef HAVE_LDAP
 #include <pas/pas-backend-ldap.h>
 #endif
-#include <libgnomevfs/gnome-vfs-init.h>
-#include <libgnorba/gnorba.h>
-#include "calendar/pcs/cal-factory.h"
 
-
-
-static CORBA_ORB orb;
+#include "calendar/pcs/cal-factory.h"
 
 /* The and addressbook calendar factories */
 
@@ -89,24 +86,50 @@ last_calendar_gone_cb (CalFactory *factory, gpointer data)
 	queue_termination ();
 }
 
-/* Creates the calendar factory object and registers it with GOAD */
-static void
-setup_pcs (int argc, char **argv)
-{
-	CORBA_Object object;
-	CORBA_Environment ev;
-	int result;
+#ifdef USING_OAF
 
-	cal_factory = cal_factory_new ();
+/* (For the OAF popt stuff, which otherwise does not get in.)  */
+#include <gnome.h>
 
-	if (!cal_factory) {
-		g_message ("setup_pcs(): Could not create the calendar factory");
-		return;
+#include <liboaf/liboaf.h>
+
+static gboolean
+register_pcs (CORBA_Object obj)
+{
+	OAF_RegistrationResult result;
+
+	result = oaf_active_server_register
+		("OAFIID:evolution:calendar-factory:1c915858-ece3-4a6f-9d81-ea0f108a9554",
+		 obj);
+
+	switch (result) {
+	case OAF_REG_SUCCESS:
+		return TRUE;	/* Wooho! */
+	case OAF_REG_NOT_LISTED:
+		g_message ("Cannot register the PCS because not listed");
+		return FALSE;
+	case OAF_REG_ALREADY_ACTIVE:
+		g_message ("Cannot register the PCS because already active");
+		return FALSE;
+	case OAF_REG_ERROR:
+	default:
+		g_message ("Cannot register the PCS because we suck");
+		return FALSE;
 	}
+}
 
-	object = bonobo_object_corba_objref (BONOBO_OBJECT (cal_factory));
+#else  /* USING_OAF */
+
+#include <libgnorba/gnorba.h>
+
+static gboolean
+register_pcs (CORBA_Object object)
+{
+	CORBA_Environment ev;
+	int result;
 
 	CORBA_exception_init (&ev);
+
 	result = goad_server_register (CORBA_OBJECT_NIL,
 				       object,
 				       "evolution:calendar-factory",
@@ -117,23 +140,47 @@ setup_pcs (int argc, char **argv)
 
 	if (ev._major != CORBA_NO_EXCEPTION || result == -1) {
 		g_message ("setup_pcs(): could not register the calendar factory");
-		bonobo_object_unref (BONOBO_OBJECT (cal_factory));
-		cal_factory = NULL;
 		CORBA_exception_free (&ev);
-		return;
-	} else if (result == -2) {
+		return FALSE;
+	}
+
+	if (result == -2) {
 		g_message ("setup_pcs(): a calendar factory is already registered");
+		CORBA_exception_free (&ev);
+		return FALSE;
+	}
+
+	CORBA_exception_free (&ev);
+	return TRUE;
+}
+
+#endif /* USING_OAF */
+
+/* Creates the calendar factory object and registers it with GOAD */
+static void
+setup_pcs (int argc, char **argv)
+{
+	CORBA_Object object;
+
+	cal_factory = cal_factory_new ();
+
+	if (!cal_factory) {
+		g_message ("setup_pcs(): Could not create the calendar factory");
+		return;
+	}
+
+	object = bonobo_object_corba_objref (BONOBO_OBJECT (cal_factory));
+
+	if (! register_pcs (object)) {
 		bonobo_object_unref (BONOBO_OBJECT (cal_factory));
 		cal_factory = NULL;
-		CORBA_exception_free (&ev);
 		return;
 	}
 
-	gtk_signal_connect (GTK_OBJECT (cal_factory), "last_calendar_gone",
+	gtk_signal_connect (GTK_OBJECT (cal_factory),
+			    "last_calendar_gone",
 			    GTK_SIGNAL_FUNC (last_calendar_gone_cb),
 			    NULL);
-
-	CORBA_exception_free (&ev);
 }
 
 
@@ -154,8 +201,20 @@ setup_vfs (int argc, char **argv)
 
 
 
+#ifdef USING_OAF
+
+static void
+init_corba (int *argc, char **argv)
+{
+	gnome_init_with_popt_table ("Personal Addressbook Server", "0.0",
+				    *argc, argv, oaf_popt_options, 0, NULL);
+	oaf_init (*argc, argv);
+}
+
+#else
+
 static void
-init_bonobo (int argc, char **argv)
+init_corba (int *argc, char **argv)
 {
 	CORBA_Environment ev;
 
@@ -163,7 +222,7 @@ init_bonobo (int argc, char **argv)
 
 	gnome_CORBA_init_with_popt_table (
 		"Personal Addressbook Server", "0.0",
-		&argc, argv, NULL, 0, NULL, GNORBA_INIT_SERVER_FUNC, &ev);
+		argc, argv, NULL, 0, NULL, GNORBA_INIT_SERVER_FUNC, &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_message ("init_bonobo(): could not initialize GOAD");
@@ -172,10 +231,16 @@ init_bonobo (int argc, char **argv)
 	}
 
 	CORBA_exception_free (&ev);
+}
 
-	orb = gnome_CORBA_ORB ();
+#endif
+
+static void
+init_bonobo (int *argc, char **argv)
+{
+	init_corba (argc, argv);
 
-	if (!bonobo_init (orb, NULL, NULL)) {
+	if (!bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL)) {
 		g_message ("init_bonobo(): could not initialize Bonobo");
 		exit (EXIT_FAILURE);
 	}
@@ -184,7 +249,7 @@ init_bonobo (int argc, char **argv)
 int
 main (int argc, char **argv)
 {
-	init_bonobo  (argc, argv);
+	init_bonobo  (&argc, argv);
 	setup_vfs    (argc, argv);
 
 	setup_pas    (argc, argv);
diff --git a/wombat/wombat.oafinfo b/wombat/wombat.oafinfo
new file mode 100644
index 0000000000..1109cc0df6
--- /dev/null
+++ b/wombat/wombat.oafinfo
@@ -0,0 +1,30 @@
+<oaf_info>
+
+<oaf_server iid="OAFIID:evolution:addressbook-server:0fbc844d-c721-4615-98d0-d67eacf42d80"
+            type="exe"
+            location="wombat">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:Evolution/BookFactory:1.0"/>
+		<item value="IDL:Bonobo/Unknown:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+                       value="The Personal Addressbook Server"/>
+</oaf_server>
+
+<oaf_server iid="OAFIID:evolution:calendar-factory:1c915858-ece3-4a6f-9d81-ea0f108a9554"
+            type="exe"
+            location="wombat">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:Evolution/Calendar/CalFactory:1.0"/>
+		<item value="IDL:Bonobo/Unknown:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+                       value="The Personal Calendar Server; calendar factory"/>
+
+</oaf_server>
+
+</oaf_info>