aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/cal-client
diff options
context:
space:
mode:
Diffstat (limited to 'calendar/cal-client')
-rw-r--r--calendar/cal-client/cal-client.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c
index 0012ec3706..43a881f50f 100644
--- a/calendar/cal-client/cal-client.c
+++ b/calendar/cal-client/cal-client.c
@@ -407,7 +407,6 @@ cal_client_construct (CalClient *client)
CalClientPrivate *priv;
GNOME_Evolution_Calendar_CalFactory factory, factory_copy;
CORBA_Environment ev;
- int result;
CORBA_exception_init (&ev);
g_return_val_if_fail (client != NULL, NULL);
@@ -415,23 +414,16 @@ cal_client_construct (CalClient *client)
priv = client->priv;
+ CORBA_exception_init (&ev);
factory = (GNOME_Evolution_Calendar_CalFactory) oaf_activate_from_id (
"OAFIID:GNOME_Evolution_Wombat_CalendarFactory",
- OAF_FLAG_NO_LOCAL, NULL, &ev);
+ 0, NULL, &ev);
- result = CORBA_Object_is_nil (factory, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
- g_message ("cal_client_construct(): could not see if the factory is NIL");
+ g_message ("cal_client_construct(): Could not activate the calendar factory");
CORBA_exception_free (&ev);
return NULL;
}
- CORBA_exception_free (&ev);
-
- if (result) {
- g_message ("cal_client_construct(): could not contact Wombat, "
- "the personal calendar server");
- return NULL;
- }
CORBA_exception_init (&ev);
factory_copy = CORBA_Object_duplicate (factory, &ev);