From 35c55267f22a30cccd78e1f45efdd2e4b353fd94 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Wed, 7 Jun 2000 19:59:48 +0000 Subject: instead of returning a text representation, decode the text and return an * cal-client/cal-client.c (cal_client_get_object): instead of returning a text representation, decode the text and return an iCalObject. Also added CalClientGetStatus which indicates success or type of failure. * cal-util/calobj.c (ical_object_find_in_string): #ifed out ical_object_find_in_string since it is unused now. * cal-client/client-test.c (list_uids): track get_object change * gui/calendar-commands.c (calendar_iterate): same * gui/e-day-view.c (e_day_view_update_event): same * gui/e-week-view.c (e_week_view_update_event): same * gui/print.c (print_day_details): same (print_day_summary): same (print_todo_details): same * gui/gnome-cal.c (trigger_alarm_cb): same * gui/gncal-todo.c (gncal_todo_update): same svn path=/trunk/; revision=3463 --- calendar/gui/e-day-view.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'calendar/gui/e-day-view.c') diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index fde159dab1..8508d08a56 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -1085,9 +1085,8 @@ e_day_view_update_event (EDayView *day_view, const gchar *uid) { EDayViewEvent *event; - gchar *obj_string; iCalObject *ico; - CalObjFindStatus status; + CalClientGetStatus status; gint day, event_num; g_return_if_fail (E_IS_DAY_VIEW (day_view)); @@ -1107,18 +1106,16 @@ e_day_view_update_event (EDayView *day_view, return; /* Get the event from the server. */ - obj_string = cal_client_get_object (day_view->calendar->client, uid); - status = ical_object_find_in_string (uid, obj_string, &ico); - g_free (obj_string); + status = cal_client_get_object (day_view->calendar->client, uid, &ico); switch (status) { - case CAL_OBJ_FIND_SUCCESS: + case CAL_CLIENT_GET_SUCCESS: /* Do nothing. */ break; - case CAL_OBJ_FIND_SYNTAX_ERROR: + case CAL_CLIENT_GET_SYNTAX_ERROR: g_warning ("syntax error uid=%s\n", uid); return; - case CAL_OBJ_FIND_NOT_FOUND: + case CAL_CLIENT_GET_NOT_FOUND: g_warning ("obj not found uid=%s\n", uid); return; } -- cgit v1.2.3