aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/cal-client/cal-client.c
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2000-08-30 02:13:21 +0800
committerDan Winship <danw@src.gnome.org>2000-08-30 02:13:21 +0800
commit3ad97477c9110a8cfd8e9641f84c8984abf33be5 (patch)
tree0bacc110535936967cc8b0b44fbb2625d4d344dc /calendar/cal-client/cal-client.c
parente02a9171c4acc0d0884c32ad6b9119663b0d9bf2 (diff)
downloadgsoc2013-evolution-3ad97477c9110a8cfd8e9641f84c8984abf33be5.tar.gz
gsoc2013-evolution-3ad97477c9110a8cfd8e9641f84c8984abf33be5.tar.zst
gsoc2013-evolution-3ad97477c9110a8cfd8e9641f84c8984abf33be5.zip
Remove USING_OAF checks
svn path=/trunk/; revision=5099
Diffstat (limited to 'calendar/cal-client/cal-client.c')
-rw-r--r--calendar/cal-client/cal-client.c13
1 files changed, 0 insertions, 13 deletions
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) {