From 06c876bf8ee5f22fd5e9e60fb9dbc3cc06756c1a Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Sat, 24 Feb 2001 00:32:36 +0000 Subject: Switched to using our own refcounted structure for loaded clients. 2001-02-23 Federico Mena Quintero * gui/alarm-notify/alarm-notify.c (AlarmNotify_addCalendar): Switched to using our own refcounted structure for loaded clients. (AlarmNotify_removeCalendar): Ditto. Also, do the full destruction of the client. (alarm_notify_destroy): Destroy each element in the hash table. * cal-client/cal-client.c (cal_client_construct): Test for exceptions from OAF when activating the Wombat calendar factory. * gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in: New .oaf.in file. * gui/alarm-notify/Makefile.am (oaf_in_files): Updated. * gui/GNOME_Evolution_Calendar.oaf.in: Put all the servers here instead of in a million files. * gui/GNOME_Evolution_Calendar_Control.oaf.in: Removed file. * gui/GNOME_Evolution_Calendar_gnomecal.oaf.in: Removed *REALLY* obsolete file. * gui/Makefile.am (oaf_in_files): Updated. svn path=/trunk/; revision=8375 --- calendar/cal-client/cal-client.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'calendar/cal-client') 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); -- cgit v1.2.3