diff options
-rw-r--r-- | calendar/ChangeLog | 5 | ||||
-rw-r--r-- | calendar/gui/e-itip-control.c | 14 |
2 files changed, 15 insertions, 4 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 7d38a9045b..89e7425238 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,5 +1,10 @@ 2004-01-16 JP Rosevear <jpr@ximian.com> + * gui/e-itip-control.c (find_server): we actually want to not + return on any error as well (like NOT FOUND) + +2004-01-16 JP Rosevear <jpr@ximian.com> + * gui/e-comp-editor-registry.h: convert to GObject * gui/e-comp-editor-registry.c (registry_data_free): routine to diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index 83f6abf2d2..5823ad7cbe 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -188,14 +188,20 @@ find_server (EItipControl *itip, ECalComponent *comp) ESource *source; ECal *ecal; icalcomponent *icalcomp; + GError *error = NULL; source = m->data; ecal = start_calendar_server (itip, source, priv->type); - if (ecal && e_cal_get_object (ecal, uid, NULL, &icalcomp, NULL)) { - icalcomponent_free (icalcomp); - - return ecal; + if (ecal && e_cal_get_object (ecal, uid, NULL, &icalcomp, &error)) { + if (error && error->code == E_CALENDAR_STATUS_OK) { + icalcomponent_free (icalcomp); + g_error_free (error); + + return ecal; + } + + g_clear_error (&error); } } } |