Update so as not to conflict with calendar (next_changed_item): update to

2000-12-06  JP Rosevear  <jpr@helixcode.com>

	* conduits/calendar/calendar-conduit.c (map_name): Update so as not to conflict
	with calendar
	(next_changed_item): update to use CalClientChange instead of CalObjChange
	(compute_status): ditto
	(pre_sync): ditto
	(for_each_modified): since we now have the cal component we can call
	local_record_from_comp directly

	* conduits/todo/todo-conduit.c: same as above

	* pcs/cal-backend.c: Remove much logging cruft
	(cal_backend_compute_changes): Calculate the changes based on the
	hashed database
	(cal_backend_get_changes): call cal_backend_compute_changes
	(cal_backend_compute_changes_foreach_key): hash callback for
	calculating deletions

	* pcs/cal-backend.h: update protype, remove logging cruft from
	object

	* pcs/cal.c (build_change_seq): dup the calobj rather than the uid
	now
	(Cal_get_changes): rename from Cal_get_changed_uids
	(cal_get_epv): reflect name change in epv

	* cal-util/cal-util.c (cal_obj_change_list_free): update assertion

	* cal-util/cal-util.h: CalObjChange now returns the entire ical
	component, update the change types.  This should all go away shortly

	* idl/evolution-calendar.idl: getChangedUIds -> getChanges.
	CalObjChange now contains the calobj rather than the uid, update
	the change types

	* cal-client/cal-client.c (cal_client_get_changes): rename from
	cal_client_get_changed_uids to make idl and addressbook

	* cal-client/cal-client.h: Update prototype

	* cal-client/cal-client.c (build_change_list): Build a list of
	CalClientChange instead of CalObjChange

	* cal-client/cal-client-types.c (cal_client_change_list_free): Free
	a glist of CalClientChanges

	* cal-client/cal-client-types.h: New file. Declarations for
	CalClientChange.

	* cal-client/Makefile.am: Build new files

svn path=/trunk/; revision=6822

1 files changed, 8 insertions, 10 deletions

diff --git a/calendar/pcs/cal.c b/calendar/pcs/cal.c
index 8383d135fb..a7f0c5dfce 100644
--- a/calendar/pcs/cal.c
+++ b/calendar/pcs/cal.c
@@ -300,34 +300,32 @@ build_change_seq (GList *changes)
 		c = l->data;
 		corba_c = &seq->_buffer[i];
 
-		corba_c->uid = CORBA_string_dup (c->uid);
+		corba_c->calobj = CORBA_string_dup (c->calobj);
 		corba_c->type = c->type;
 	}
 
 	return seq;
 }
 
-/* Cal::get_changed_uids method */
+/* Cal::get_changes method */
 static GNOME_Evolution_Calendar_CalObjChangeSeq *
-Cal_get_changed_uids (PortableServer_Servant servant,
-		      GNOME_Evolution_Calendar_CalObjType type,
-		      GNOME_Evolution_Calendar_Time_t since,
-		      CORBA_Environment *ev)
+Cal_get_changes (PortableServer_Servant servant,
+		 GNOME_Evolution_Calendar_CalObjType type,
+		 const CORBA_char *change_id,
+		 CORBA_Environment *ev)
 {
 	Cal *cal;
 	CalPrivate *priv;
 	GList *changes;
 	GNOME_Evolution_Calendar_CalObjChangeSeq *seq;
 	int t;
-	time_t s;
 
 	cal = CAL (bonobo_object_from_servant (servant));
 	priv = cal->priv;
 
 	t = uncorba_obj_type (type);
-	s = (time_t) since;
 	
-	changes = cal_backend_get_changed_uids (priv->backend, t, s);
+	changes = cal_backend_get_changes (priv->backend, t, change_id);
 	seq = build_change_seq (changes);
 
 	cal_obj_change_list_free (changes);
@@ -564,7 +562,7 @@ cal_get_epv (void)
 	epv->countObjects = Cal_get_n_objects;
 	epv->getObject    = Cal_get_object;
 	epv->getUIds      = Cal_get_uids;
-	epv->getChangedUIds     = Cal_get_changed_uids;
+	epv->getChanges   = Cal_get_changes;
 	epv->getObjectsInRange  = Cal_get_objects_in_range;
 	epv->getAlarmsInRange   = Cal_get_alarms_in_range;
 	epv->getAlarmsForObject = Cal_get_alarms_for_object;