aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--addressbook/ChangeLog10
-rw-r--r--addressbook/backend/ebook/e-book.c13
-rw-r--r--addressbook/backend/ebook/load-gnomecard-addressbook.c30
-rw-r--r--addressbook/backend/ebook/load-pine-addressbook.c30
-rw-r--r--addressbook/backend/ebook/test-client-list.c11
-rw-r--r--addressbook/backend/ebook/test-client.c30
-rw-r--r--addressbook/backend/pas/pas-book-factory.c46
-rw-r--r--addressbook/conduit/address-conduit.h7
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/cal-client/cal-client.c13
-rw-r--r--calendar/cal-client/client-test.c36
-rw-r--r--calendar/conduits/calendar/calendar-conduit.h5
-rw-r--r--calendar/conduits/todo/todo-conduit.h8
13 files changed, 32 insertions, 214 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 6129900604..5d51d15bf0 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,13 @@
+2000-08-29 Dan Winship <danw@helixcode.com>
+
+ * backend/ebook/e-book.c:
+ * backend/ebook/test-client.c:
+ * backend/ebook/test-client-list.c:
+ * backend/ebook/load-gnomecard-addressbook.c:
+ * backend/ebook/load-pine-addressbook.c:
+ * backend/pas/pas-book-factory.c:
+ * conduit/address-conduit.h: Remove USING_OAF checks
+
2000-08-28 Christopher James Lahey <clahey@helixcode.com>
* gui/component/addressbook.c: Use the right argument name to turn
diff --git a/addressbook/backend/ebook/e-book.c b/addressbook/backend/ebook/e-book.c
index 38179559ba..2023f1bf83 100644
--- a/addressbook/backend/ebook/e-book.c
+++ b/addressbook/backend/ebook/e-book.c
@@ -11,6 +11,7 @@
#include <config.h>
#include <gtk/gtksignal.h>
#include <gtk/gtkmarshal.h>
+#include <liboaf/liboaf.h>
#include "addressbook.h"
#include "e-card-cursor.h"
@@ -19,13 +20,7 @@
GtkObjectClass *e_book_parent_class;
-#ifdef USING_OAF
-#include <liboaf/liboaf.h>
#define CARDSERVER_OAF_ID "OAFIID:evolution:addressbook-server:0fbc844d-c721-4615-98d0-d67eacf42d80"
-#else
-#include <libgnorba/gnorba.h>
-#define CARDSERVER_GOAD_ID "evolution:addressbook-server"
-#endif
typedef enum {
URINotLoaded,
@@ -450,14 +445,8 @@ e_book_construct (EBook *book)
* Connect to the Personal Addressbook Server.
*/
-#ifdef USING_OAF
book->priv->book_factory = (Evolution_BookFactory)
oaf_activate_from_id (CARDSERVER_OAF_ID, 0, NULL, NULL);
-#else
- book->priv->book_factory = (Evolution_BookFactory)
- goad_server_activate_with_id (NULL, CARDSERVER_GOAD_ID, 0, NULL);
-#endif
-
if (book->priv->book_factory == CORBA_OBJECT_NIL) {
g_warning ("e_book_construct: Could not obtain a handle "
"to the Personal Addressbook Server!\n");
diff --git a/addressbook/backend/ebook/load-gnomecard-addressbook.c b/addressbook/backend/ebook/load-gnomecard-addressbook.c
index f1f20bf50b..3295854b0a 100644
--- a/addressbook/backend/ebook/load-gnomecard-addressbook.c
+++ b/addressbook/backend/ebook/load-gnomecard-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)
{
@@ -99,7 +74,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);
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);
diff --git a/addressbook/backend/ebook/test-client-list.c b/addressbook/backend/ebook/test-client-list.c
index e492323310..69422ba20e 100644
--- a/addressbook/backend/ebook/test-client-list.c
+++ b/addressbook/backend/ebook/test-client-list.c
@@ -2,12 +2,7 @@
#include <config.h>
#include <bonobo.h>
#include <gnome.h>
-
-#ifdef USING_OAF
#include <liboaf/liboaf.h>
-#else
-#include <libgnorba/gnorba.h>
-#endif
#include "e-book.h"
@@ -16,14 +11,8 @@ CORBA_Environment ev;
static void
init_bonobo (int argc, char **argv)
{
-#ifdef USING_OAF
gnome_init ("blah", "0.0", argc, argv);
oaf_init (argc, argv);
-#else
- gnome_CORBA_init_with_popt_table (
- "blah", "0.0",
- &argc, argv, NULL, 0, NULL, GNORBA_INIT_SERVER_FUNC, &ev);
-#endif
if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
g_error (_("Could not initialize Bonobo"));
diff --git a/addressbook/backend/ebook/test-client.c b/addressbook/backend/ebook/test-client.c
index ef13c1ab96..acbeedac41 100644
--- a/addressbook/backend/ebook/test-client.c
+++ b/addressbook/backend/ebook/test-client.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 <e-book.h>
@@ -32,32 +33,6 @@
static CORBA_Environment ev;
static char *cardstr;
-#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)
{
@@ -172,7 +147,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);
cardstr = NULL;
diff --git a/addressbook/backend/pas/pas-book-factory.c b/addressbook/backend/pas/pas-book-factory.c
index 626c7420e2..02dedbabe5 100644
--- a/addressbook/backend/pas/pas-book-factory.c
+++ b/addressbook/backend/pas/pas-book-factory.c
@@ -10,17 +10,12 @@
#include <config.h>
#include <ctype.h>
#include <gnome.h>
+#include <liboaf/liboaf.h>
#include "addressbook.h"
#include "pas-book-factory.h"
-#ifdef USING_OAF
-#include <liboaf/liboaf.h>
#define PAS_BOOK_FACTORY_OAF_ID "OAFIID:evolution:addressbook-server:0fbc844d-c721-4615-98d0-d67eacf42d80"
-#else
-#include <libgnorba/gnorba.h>
-#define PAS_BOOK_FACTORY_GOAD_ID "evolution:addressbook-server"
-#endif
static BonoboObjectClass *pas_book_factory_parent_class;
POA_Evolution_BookFactory__vepv pas_book_factory_vepv;
@@ -424,8 +419,6 @@ pas_book_factory_new (void)
return factory;
}
-#ifdef USING_OAF
-
static gboolean
register_factory (CORBA_Object obj)
{
@@ -451,43 +444,6 @@ register_factory (CORBA_Object obj)
}
}
-#else
-
-static gboolean
-register_factory (CORBA_Object obj)
-{
- CORBA_Environment ev;
- int ret;
-
- CORBA_exception_init (&ev);
- ret = goad_server_register (NULL, obj, PAS_BOOK_FACTORY_GOAD_ID, "server", &ev);
-
- if (ev._major != CORBA_NO_EXCEPTION) {
- g_message ("pas_book_factory_activate: Exception "
- "registering PASBookFactory!\n");
- CORBA_exception_free (&ev);
- return FALSE;
- }
-
- CORBA_exception_free (&ev);
-
- switch (ret) {
- case 0:
- return TRUE;
- case -2:
- g_message ("pas_book_factory_activate: Another "
- "PASBookFactory is already running.\n");
- return FALSE;
- case -1:
- default:
- g_message ("pas_book_factory_activate: Error "
- "registering PASBookFactory!\n");
- return FALSE;
- }
-}
-
-#endif
-
/**
* pas_book_factory_activate:
*/
diff --git a/addressbook/conduit/address-conduit.h b/addressbook/conduit/address-conduit.h
index 9858504fd7..427e6b8c91 100644
--- a/addressbook/conduit/address-conduit.h
+++ b/addressbook/conduit/address-conduit.h
@@ -7,6 +7,7 @@
#include <fcntl.h>
#include <unistd.h>
#include <gnome.h>
+#include <liboaf/liboaf.h>
#include <pi-address.h>
#include <gpilotd/gnome-pilot-conduit.h>
#include <gpilotd/gnome-pilot-conduit-standard-abs.h>
@@ -15,12 +16,6 @@
#include "ebook/e-book.h"
#include "ebook/e-book-view.h"
-#ifdef USING_OAF
-#include <liboaf/liboaf.h>
-#else
-#include <libgnorba/gnorba.h>
-#endif
-
/* This is the local record structure for the GnomeCal conduit. */
typedef struct _AddressbookLocalRecord AddressbookLocalRecord;
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index b61163c8b8..ede3b191b7 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2000-08-29 Dan Winship <danw@helixcode.com>
+
+ * cal-client/client-test.c:
+ * cal-client/cal-client.c:
+ * conduits/todo/todo-conduit.h:
+ * conduits/calendar/calendar-conduit.h: remove USING_OAF checks.
+
2000-08-29 JP Rosevear <jpr@helixcode.com>
* gui/gnome-cal.c (gnome_calendar_edit_object): Use
diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c
index d48a11a7f0..001c36fca7 100644
--- a/calendar/cal-client/cal-client.c
+++ b/calendar/cal-client/cal-client.c
@@ -22,12 +22,7 @@
#include <config.h>
#include <gtk/gtksignal.h>
-
-#ifdef USING_OAF
#include <liboaf/liboaf.h>
-#else
-#include <libgnorba/gnorba.h>
-#endif
#include "cal-client.h"
#include "cal-listener.h"
@@ -392,17 +387,9 @@ cal_client_construct (CalClient *client)
priv = client->priv;
-#ifdef USING_OAF
factory = (Evolution_Calendar_CalFactory) oaf_activate_from_id (
"OAFIID:evolution:calendar-factory:1c915858-ece3-4a6f-9d81-ea0f108a9554",
OAF_FLAG_NO_LOCAL, NULL, &ev);
-#else
- factory = (Evolution_Calendar_CalFactory) goad_server_activate_with_id (
- NULL,
- "evolution:calendar-factory",
- GOAD_ACTIVATE_REMOTE,
- NULL);
-#endif
result = CORBA_Object_is_nil (factory, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
diff --git a/calendar/cal-client/client-test.c b/calendar/cal-client/client-test.c
index 7f79b58266..c28e3f5696 100644
--- a/calendar/cal-client/client-test.c
+++ b/calendar/cal-client/client-test.c
@@ -21,6 +21,7 @@
#include <config.h>
#include <bonobo.h>
+#include <liboaf/liboaf.h>
#include <gnome.h>
#include <cal-client/cal-client.h>
@@ -190,45 +191,14 @@ create_client (CalClient **client, const char *uri, gboolean load)
}
}
-#ifdef USING_OAF
-
-#include <liboaf/liboaf.h>
-
-static void
-init_corba (int *argc, char **argv)
-{
- gnome_init ("tl-test", VERSION, *argc, argv);
- oaf_init (*argc, argv);
-}
-
-#else
-
-#include <libgnorba/gnorba.h>
-
-static void
-init_corba (int *argc, char **argv)
-{
- CORBA_Environment ev;
-
- CORBA_exception_init (&ev);
- gnome_CORBA_init ("tl-test", VERSION, &argc, argv, 0, &ev);
- if (ev._major != CORBA_NO_EXCEPTION) {
- g_message ("main(): could not initialize the ORB");
- CORBA_exception_free (&ev);
- exit (1);
- }
- CORBA_exception_free (&ev);
-}
-
-#endif
-
int
main (int argc, char **argv)
{
bindtextdomain (PACKAGE, GNOMELOCALEDIR);
textdomain (PACKAGE);
- init_corba (&argc, argv);
+ gnome_init ("tl-test", VERSION, argc, argv);
+ oaf_init (argc, argv);
if (!bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL)) {
g_message ("main(): could not initialize Bonobo");
diff --git a/calendar/conduits/calendar/calendar-conduit.h b/calendar/conduits/calendar/calendar-conduit.h
index a8a1c81a50..359d966d83 100644
--- a/calendar/conduits/calendar/calendar-conduit.h
+++ b/calendar/conduits/calendar/calendar-conduit.h
@@ -14,12 +14,7 @@
#include <cal-client/cal-client.h>
#include <cal-util/calobj.h>
#include <cal-util/timeutil.h>
-
-#ifdef USING_OAF
#include <liboaf/liboaf.h>
-#else
-#include <libgnorba/gnorba.h>
-#endif
/* This is the local record structure for the GnomeCal conduit. */
diff --git a/calendar/conduits/todo/todo-conduit.h b/calendar/conduits/todo/todo-conduit.h
index f01b52173d..31970ce356 100644
--- a/calendar/conduits/todo/todo-conduit.h
+++ b/calendar/conduits/todo/todo-conduit.h
@@ -14,14 +14,6 @@
#include <cal-util/calobj.h>
#include <cal-util/timeutil.h>
-/*
-#ifdef USING_OAF
-#include <liboaf/liboaf.h>
-#else
-#include <libgnorba/gnorba.h>
-#endif
-*/
-
#include <liboaf/liboaf.h>
#include <libgnorba/gnorba.h>
generated by cgit (git 2.34.1) at 2024-11-17 07:08:12 +0800