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

1 files changed, 5 insertions, 8 deletions

diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index c09d3fc541..7f5eb7b15f 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -966,9 +966,8 @@ e_week_view_update_event		(EWeekView	*week_view,
 {
 	EWeekViewEvent *event;
 	gint event_num, num_days;
-	gchar *obj_string;
 	iCalObject *ico;
-	CalObjFindStatus status;
+	CalClientGetStatus status;
 
 	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
 
@@ -982,18 +981,16 @@ e_week_view_update_event		(EWeekView	*week_view,
 		return;
 
 	/* Get the event from the server. */
-	obj_string = cal_client_get_object (week_view->calendar->client, uid);
-	status = ical_object_find_in_string (uid, obj_string, &ico);
-	g_free (obj_string);
+	status = cal_client_get_object (week_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;
 	}