New struct to wrap instances of calendar objects for recurrencies and

2000-02-08  Federico Mena Quintero  <federico@helixcode.com>

	* evolution-calendar.idl (CalObjInstance): New struct to wrap
	instances of calendar objects for recurrencies and alarms.
	(Cal::get_events_in_range): New method to get ocurring and
	recurring events by time range.

	* cal-backend.c (cal_backend_get_events_in_range): New function to
	get a list of event instances in a time range.
	(string_from_ical_object): New internal function.
	(cal_backend_get_object): Use string_from_ical_object() instead of
	doing everything ourselves.
	(cal_backend_get_events_in_range): New function to get a list of
	the events that occur or recur in a specified time range.

	* cal-client.c (cal_client_get_events_in_range): Implemented
	client-side function.

	* cal-util.h:
	* cal-util.c: New files with utilities and types common to the
	client and server parts.
	(CalObjInstance): New structure to hold an instance of an actual
	occurrence, recurrence, or alarm trigger of a calendar object.
	(cal_obj_instance_list_free): New function to free a list of
	calendar object instances.

	* cal.c (Cal_get_events_in_range): Implemented new method.

	* corba-cal.c (cal_repo_get_updated_objects): Free `str' with
	free(), not g_free(), since calendar_get_as_vcal_string() uses
	writeMemVObject(), which uses realloc().  Fixed in gnome-pim as
	well.

svn path=/trunk/; revision=1693

2 files changed, 5 insertions, 1 deletions

diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 408f80dd76..5fa18ba0dd 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -62,6 +62,8 @@ gnomecal_SOURCES =				\
 	cal-client.h				\
 	cal-listener.c				\
 	cal-listener.h				\
+	cal-util.c				\
+	cal-util.h				\
 	calendar.c				\
 	calendar.h				\
 	calendar-conduit.h			\
@@ -134,6 +136,8 @@ tlacuache_SOURCES =				\
 	cal-common.h				\
 	cal-factory.c				\
 	cal-factory.h				\
+	cal-util.c				\
+	cal-util.h				\
 	calobj.c				\
 	calobj.h				\
 	job.c					\
diff --git a/calendar/gui/corba-cal.c b/calendar/gui/corba-cal.c
index 74afc0e76a..7b9878f875 100644
--- a/calendar/gui/corba-cal.c
+++ b/calendar/gui/corba-cal.c
@@ -295,7 +295,7 @@ cal_repo_get_updated_objects (PortableServer_Servant servant,
 	}
 	str = calendar_get_as_vcal_string (dirty_cal);
 	res = CORBA_string_dup (str);
-	g_free (str);
+	free (str); /* calendar_get_as_vcal_string() uses writeMemVObject(), which uses realloc() */
 	calendar_destroy (dirty_cal);
 
 	return res;