From 3ad97477c9110a8cfd8e9641f84c8984abf33be5 Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@src.gnome.org>
Date: Tue, 29 Aug 2000 18:13:21 +0000
Subject: Remove USING_OAF checks

svn path=/trunk/; revision=5099
---
 addressbook/backend/ebook/load-pine-addressbook.c | 30 +++--------------------
 1 file changed, 3 insertions(+), 27 deletions(-)

(limited to 'addressbook/backend/ebook/load-pine-addressbook.c')

diff --git a/addressbook/backend/ebook/load-pine-addressbook.c b/addressbook/backend/ebook/load-pine-addressbook.c
index 0cc1be693c..7d74fe20a4 100644
--- a/addressbook/backend/ebook/load-pine-addressbook.c
+++ b/addressbook/backend/ebook/load-pine-addressbook.c
@@ -1,6 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 #include <config.h>
 #include <bonobo.h>
+#include <liboaf/liboaf.h>
 #include <gnome.h>
 #include <stdio.h>
 
@@ -8,32 +9,6 @@
 
 static CORBA_Environment ev;
 
-#ifdef USING_OAF
-
-#include <liboaf/liboaf.h>
-
-static void
-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);
-}
-
-#endif
-
 static void
 init_bonobo (int argc, char **argv)
 {
@@ -149,7 +124,8 @@ main (int argc, char **argv)
 
 	CORBA_exception_init (&ev);
 
-	init_corba (&argc, argv);
+	gnome_init_with_popt_table("blah", "0.0", argc, argv, NULL, 0, NULL);
+	oaf_init (argc, argv);
 	init_bonobo (argc, argv);
 
 	gtk_idle_add ((GtkFunction) ebook_create, NULL);
-- 
cgit v1.2.3