From 9483369aa04a5d2c4dc5c0034a3e4431153d9c99 Mon Sep 17 00:00:00 2001
From: Ettore Perazzoli <ettore@src.gnome.org>
Date: Fri, 28 Apr 2000 04:23:19 +0000
Subject: Made Evolution OAF-compatible.

svn path=/trunk/; revision=2673
---
 addressbook/backend/ebook/test-client.c | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

(limited to 'addressbook/backend/ebook/test-client.c')

diff --git a/addressbook/backend/ebook/test-client.c b/addressbook/backend/ebook/test-client.c
index 15c5410146..ef13c1ab96 100644
--- a/addressbook/backend/ebook/test-client.c
+++ b/addressbook/backend/ebook/test-client.c
@@ -2,7 +2,6 @@
 #include <config.h>
 #include <bonobo.h>
 #include <gnome.h>
-#include <libgnorba/gnorba.h>
 
 #include <e-book.h>
 
@@ -31,22 +30,39 @@
 "
 
 static CORBA_Environment ev;
-static CORBA_ORB orb;
 static char *cardstr;
 
+#ifdef USING_OAF
+
+#include <liboaf/liboaf.h>
+
 static void
-init_bonobo (int argc, char **argv)
+init_corba (int *argc, char **argv)
 {
+	gnome_init_with_popt_table("blah", "0.0", *argc, argv, NULL, 0, NULL);
+
+	oaf_init (*argc, argv);
+}
+
+#else
+
+#include <libgnorba/gnorba.h>
 
+static void
+init_corba (int *argc, char **argv)
+{
 	gnome_CORBA_init_with_popt_table (
 		"blah", "0.0",
-		&argc, argv, NULL, 0, NULL, GNORBA_INIT_SERVER_FUNC, &ev);
+		argc, argv, NULL, 0, NULL, GNORBA_INIT_SERVER_FUNC, &ev);
+}
 
-	orb = gnome_CORBA_ORB ();
+#endif
 
-	if (bonobo_init (orb, NULL, NULL) == FALSE)
+static void
+init_bonobo (int argc, char **argv)
+{
+	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
 		g_error (_("Could not initialize Bonobo"));
-
 }
 
 static void
@@ -155,6 +171,8 @@ main (int argc, char **argv)
 {
 
 	CORBA_exception_init (&ev);
+
+	init_corba (&argc, argv);
 	init_bonobo (argc, argv);
 
 	cardstr = NULL;
-- 
cgit v1.2.3