diff options
| -rw-r--r-- | calendar/ChangeLog | 8 | ||||
| -rw-r--r-- | calendar/gui/itip-utils.c | 12 |
2 files changed, 15 insertions, 5 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 5d6da167b3..a059becf08 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,5 +1,13 @@ 2003-03-20 Rodrigo Moya <rodrigo@ximian.com> + Fixes #39770 + + * gui/itip-utils.c (itip_Send_comp): check the CORBA exception instead + of the g_return_val_if_fail. Also, use a CORBA_Object for the value + returned from bonobo_activation_activate_from_id. + +2003-03-20 Rodrigo Moya <rodrigo@ximian.com> + * importers/ical-importer.c: removed activation of shell_client. (importer_destroy_cb): no need to unref shell_client. (connect_to_shell): removed. diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index 94517dff6a..37a4e383fa 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -817,8 +817,7 @@ gboolean itip_send_comp (CalComponentItipMethod method, CalComponent *send_comp, CalClient *client, icalcomponent *zones) { - BonoboObject *bonobo_server; - GNOME_Evolution_Composer composer_server; + CORBA_Object *composer_server; CalComponent *comp = NULL; icalcomponent *top_level = NULL; GList *users; @@ -835,9 +834,12 @@ itip_send_comp (CalComponentItipMethod method, CalComponent *send_comp, CORBA_exception_init (&ev); /* Obtain an object reference for the Composer. */ - bonobo_server = bonobo_activation_activate_from_id (GNOME_EVOLUTION_COMPOSER_OAFIID, 0, NULL, &ev); - g_return_val_if_fail (bonobo_server != NULL, FALSE); - composer_server = BONOBO_OBJREF (bonobo_server); + composer_server = bonobo_activation_activate_from_id (GNOME_EVOLUTION_COMPOSER_OAFIID, 0, NULL, &ev); + if (BONOBO_EX (&ev)) { + g_warning ("Could not activate composer: %s", bonobo_exception_get_text (&ev)); + CORBA_exception_free (&ev); + return FALSE; + } /* Give the server a chance to manipulate the comp */ if (method != CAL_COMPONENT_METHOD_PUBLISH) { |