From bdaae91bfed75939e5fc0d406bd3372a24b49d8a Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Thu, 23 Oct 2003 12:54:43 +0000 Subject: guard against irrelevant args (ie if there was an error) 2003-10-23 JP Rosevear * pcs/cal.c (cal_notify_object_modified): guard against irrelevant args (ie if there was an error) (cal_notify_object_removed): ditto (cal_notify_timezone_added): ditto * pcs/cal-backend-sync.c (_cal_backend_is_read_only): init value to something known (_cal_backend_get_cal_address): ditto (_cal_backend_get_alarm_email_address): ditto (_cal_backend_get_ldap_attribute): ditto (_cal_backend_get_static_capabilities): ditto (_cal_backend_modify_object): ditto (_cal_backend_remove_object): ditto (_cal_backend_get_object_list): ditto 2003-10-22 JP Rosevear * gui/e-cal-list-view.c (e_cal_list_view_new): create a model and pass it as an arg during creation * gui/e-day-view.c (e_day_view_new): unref the model * gui/e-week-view.c (e_week_view_new): ditto 2003-10-22 JP Rosevear * cal-client/cal-client.c (cal_client_get_object): only change to invalid object error code if we got the object but couldn't parse it, and only check for timezones if we had success * gui/comp-util.c (cal_comp_is_on_server): don't throw a warning if the object simply does not exist svn path=/trunk/; revision=23032 --- calendar/cal-client/cal-client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'calendar/cal-client') diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c index 95efdd6d5d..a77d7731dd 100644 --- a/calendar/cal-client/cal-client.c +++ b/calendar/cal-client/cal-client.c @@ -2171,9 +2171,9 @@ cal_client_get_object (CalClient *client, const char *uid, const char *rid, ical *icalcomp = icalparser_parse_string (our_op->string); g_free (our_op->string); - if (!*icalcomp) { + if (status == E_CALENDAR_STATUS_OK && !*icalcomp) { status = E_CALENDAR_STATUS_INVALID_OBJECT; - } else { + } else if (status == E_CALENDAR_STATUS_OK){ CalClientGetTimezonesData cb_data; /* Now make sure we have all timezones needed for this object. -- cgit v1.2.3