New; tell each query about a created/modified/removed object.

	* pcs/cal-backend.c (cal_backend_notify_object_created,
	cal_backend_notify_object_modified,
	cal_backend_notify_object_removed): New; tell each query about a
	created/modified/removed object.

	* pcs/cal.c (cal_notify_object_created): Use
	cal_backend_notify_object_created.
	(cal_notify_object_modified, cal_notify_object_removed): Likewise
	for modified/removed
	(cal_notify_objects_received): we need both the before and after
	forms for the modified objects so they can be resolved as
	adds/modifies/removes per-query. But the caller can just call the
	cal_backend_* routines for each object anyway, so just remove the
	created/modified/removed lists.

	* pcs/cal-backend-sync.c (cal_backend_sync_receive_objects):
	Remove created/modified/removed list arguments.
	(_cal_backend_receive_objects): Likewise.

	* pcs/cal-backend-file.c (cal_backend_file_receive_objects):
	Remove created/modified/removed list arguments. Replace the one
	use of *removed with a call to cal_backend_notify_object_removed.

svn path=/trunk/; revision=23102

1 files changed, 4 insertions, 8 deletions

diff --git a/calendar/pcs/cal-backend-sync.c b/calendar/pcs/cal-backend-sync.c
index 63f08171c1..c385a89b72 100644
--- a/calendar/pcs/cal-backend-sync.c
+++ b/calendar/pcs/cal-backend-sync.c
@@ -149,15 +149,13 @@ cal_backend_sync_discard_alarm (CalBackendSync *backend, Cal *cal, const char *u
 }
 
 CalBackendSyncStatus
-cal_backend_sync_receive_objects (CalBackendSync *backend, Cal *cal, const char *calobj,
-				  GList **created, GList **modified, GList **removed)
+cal_backend_sync_receive_objects (CalBackendSync *backend, Cal *cal, const char *calobj)
 {
 	g_return_val_if_fail (backend && CAL_IS_BACKEND_SYNC (backend), GNOME_Evolution_Calendar_OtherError);
 
 	g_assert (CAL_BACKEND_SYNC_GET_CLASS (backend)->receive_objects_sync);
 
-	return (* CAL_BACKEND_SYNC_GET_CLASS (backend)->receive_objects_sync) (backend, cal, calobj, 
-									       created, modified, removed);
+	return (* CAL_BACKEND_SYNC_GET_CLASS (backend)->receive_objects_sync) (backend, cal, calobj);
 }
 
 CalBackendSyncStatus
@@ -393,12 +391,10 @@ static void
 _cal_backend_receive_objects (CalBackend *backend, Cal *cal, const char *calobj)
 {
 	CalBackendSyncStatus status;
-	GList *created = NULL, *modified = NULL, *removed = NULL;
 	
-	status = cal_backend_sync_receive_objects (CAL_BACKEND_SYNC (backend), cal, calobj, 
-						   &created, &modified, &removed);
+	status = cal_backend_sync_receive_objects (CAL_BACKEND_SYNC (backend), cal, calobj);
 
-	cal_notify_objects_received (cal, status, created, modified, removed);
+	cal_notify_objects_received (cal, status);
 }
 
 static void