diff options
-rw-r--r-- | calendar/ChangeLog | 5 | ||||
-rw-r--r-- | calendar/gui/e-itip-control.c | 12 |
2 files changed, 8 insertions, 9 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index a0abb76bb7..2da74f7200 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,8 @@ +2004-05-20 JP Rosevear <jpr@ximian.com> + + * gui/e-itip-control.c (find_server): proper look for figuring out + if the object is on the server + 2004-05-20 JP Rosevear <jpr@novell.com> * gui/tag-calendar.c (tag_calendar_by_comp): pass the client diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index 53dd7fbec6..5027e3953c 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -189,20 +189,14 @@ 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, &error)) { - if (error && error->code == E_CALENDAR_STATUS_OK) { - icalcomponent_free (icalcomp); - g_error_free (error); + if (ecal && e_cal_get_object (ecal, uid, NULL, &icalcomp, NULL)) { + icalcomponent_free (icalcomp); - return ecal; - } - - g_clear_error (&error); + return ecal; } } } |