evolution-mapi r72 - in trunk: . src/calendar src/libexchangemapi

[msuman svn gnome org]

Author: msuman
Date: Wed Jan 21 06:51:23 2009
New Revision: 72
URL: http://svn.gnome.org/viewvc/evolution-mapi?rev=72&view=rev

Log:
2009-01-21  Suman Manjunath  <msuman novell com>

        ** Fix for bug #541209

        ** Adapt to the new APIs from upstream libical. Changes made include
        using the "_r" counterpart for the following APIs:
        + icalproperty_as_ical_string ()
        + icalvalue_as_ical_string ()
        + icalcomponent_as_ical_string ()
        + icalparameter_as_ical_string ()
        + icaldurationtype_as_ical_string ()
        + icalenum_reqstat_code ()
        + icallangbind_property_eval_string ()
        + icallangbind_quote_as_ical ()
        + icalmime_text_end_part ()
        + icalperiodtype_as_ical_string ()
        + icalproperty_enum_to_string ()
        + icalproperty_get_parameter_as_string ()
        + icalproperty_get_value_as_string ()
        + icalproperty_get_property_name ()
        + icalrecurrencetype_as_string ()
        + icaltime_as_ical_string ()
        + icalreqstattype_as_string ()
        + icalvalue_binary_as_ical_string ()
        + icalvalue_int_as_ical_string ()
        + icalvalue_utcoffset_as_ical_string ()
        + icalvalue_string_as_ical_string ()
        + icalvalue_recur_as_ical_string ()
        + icalvalue_text_as_ical_string ()
        + icalvalue_attach_as_ical_string ()
        + icalvalue_duration_as_ical_string ()
        + icalvalue_date_as_ical_string ()
        + icalvalue_datetime_as_ical_string ()
        + icalvalue_float_as_ical_string ()
        + icalvalue_geo_as_ical_string ()
        + icalvalue_datetimeperiod_as_ical_string ()
        + icalvalue_period_as_ical_string ()
        + icalvalue_trigger_as_ical_string ()
        + icalvalue_as_ical_string ()



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/calendar/ChangeLog
   trunk/src/calendar/e-cal-backend-mapi.c
   trunk/src/libexchangemapi/ChangeLog
   trunk/src/libexchangemapi/exchange-mapi-cal-recur-utils.c
   trunk/src/libexchangemapi/exchange-mapi-cal-utils.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Jan 21 06:51:23 2009
@@ -35,7 +35,6 @@
 AC_PROG_MAKE_SET
 
 AC_DEFINE(_GNU_SOURCE, 1, [Use GNU extensions])
-AC_DEFINE(HANDLE_LIBICAL_MEMORY, 1, [Define it once memory returned by libical is freed properly])
 
 dnl ************
 dnl i18n stuff

Modified: trunk/src/calendar/e-cal-backend-mapi.c
==============================================================================
--- trunk/src/calendar/e-cal-backend-mapi.c	(original)
+++ trunk/src/calendar/e-cal-backend-mapi.c	Wed Jan 21 06:51:23 2009
@@ -1666,7 +1666,7 @@
 			/*remove a single instance of a recurring event and modify */
 			time_rid = icaltime_from_string (rid);
 			e_cal_util_remove_instances (icalcomp, time_rid, mod);
-			new_calobj  = (char *) icalcomponent_as_ical_string (icalcomp);
+			new_calobj  = (char *) icalcomponent_as_ical_string_r (icalcomp);
 			status = e_cal_backend_mapi_modify_object (backend, cal, new_calobj, CALOBJ_MOD_ALL, &obj, &new_object);
 			if (status == GNOME_Evolution_Calendar_Success) {
 				*old_object = obj;
@@ -1911,7 +1911,7 @@
 					icalcomponent_set_method (resp_comp, ICAL_METHOD_RESPONSE);
 					icalcomponent_add_component (resp_comp, 
 						icalcomponent_new_clone(e_cal_component_get_icalcomponent(comp)));
-					comp_str = icalcomponent_as_ical_string (resp_comp);
+					comp_str = icalcomponent_as_ical_string_r (resp_comp);
 					status = e_cal_backend_mapi_send_objects (backend, cal, comp_str, &users, &new_object);
 					g_free (comp_str);
 					g_free (new_object);
@@ -1977,7 +1977,7 @@
 	if (!icalcomp)
 		return GNOME_Evolution_Calendar_InvalidObject;
 
-	*object = icalcomponent_as_ical_string (icalcomp);
+	*object = icalcomponent_as_ical_string_r (icalcomp);
 
 	return GNOME_Evolution_Calendar_Success;
 }

Modified: trunk/src/libexchangemapi/exchange-mapi-cal-recur-utils.c
==============================================================================
--- trunk/src/libexchangemapi/exchange-mapi-cal-recur-utils.c	(original)
+++ trunk/src/libexchangemapi/exchange-mapi-cal-recur-utils.c	Wed Jan 21 06:51:23 2009
@@ -1070,7 +1070,7 @@
 			flag32 = 0x5AE980DF; 
 		else if (end_type == END_AFTER_N_OCCURRENCES) {
 			ECalComponentDateTime dtstart; 
-			gchar *rrule_str = icalrecurrencetype_as_string (rt); 
+			gchar *rrule_str = icalrecurrencetype_as_string_r (rt); 
 			time_t *array = g_new0 (time_t, rt->count); 
 
 			e_cal_component_get_dtstart (comp, &dtstart);

Modified: trunk/src/libexchangemapi/exchange-mapi-cal-utils.c
==============================================================================
--- trunk/src/libexchangemapi/exchange-mapi-cal-utils.c	(original)
+++ trunk/src/libexchangemapi/exchange-mapi-cal-utils.c	Wed Jan 21 06:51:23 2009
@@ -1307,7 +1307,7 @@
 	if (comp)
 		icalcomponent_add_component (icalcomp, 
 			icalcomponent_new_clone(e_cal_component_get_icalcomponent(comp)));
-	str = icalcomponent_as_ical_string (icalcomp);
+	str = icalcomponent_as_ical_string_r (icalcomp);
 	icalcomponent_free (icalcomp);
 	if (comp)
 		g_object_unref (comp);