diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/cal-client/cal-client.c | 13 | ||||
| -rw-r--r-- | calendar/cal-client/client-test.c | 36 | ||||
| -rw-r--r-- | calendar/conduits/calendar/calendar-conduit.h | 5 | ||||
| -rw-r--r-- | calendar/conduits/todo/todo-conduit.h | 8 |
5 files changed, 10 insertions, 59 deletions
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> |