evolution-jescs r273 - in trunk: . calendar lib storage

[jedywang svn gnome org]

Author: jedywang
Date: Mon Feb 16 09:41:10 2009
New Revision: 273
URL: http://svn.gnome.org/viewvc/evolution-jescs?rev=273&view=rev

Log:
2009-02-16  Wang Xin  <jedy wang sun com>

	Fixes #571961. 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 ()

	* calendar/cal-backend-wcap-events.c:
	* calendar/cal-backend-wcap.c:
	* configure.in: Bump to 2.25.2.
	* lib/sunone-connection.c:
	* lib/sunone-util.c:
	* storage/sunone-invitation-list-model.c:
	* storage/sunone-invitation-list.c:



Modified:
   trunk/ChangeLog
   trunk/calendar/cal-backend-wcap-events.c
   trunk/calendar/cal-backend-wcap.c
   trunk/configure.in
   trunk/lib/sunone-connection.c
   trunk/lib/sunone-util.c
   trunk/storage/sunone-invitation-list-model.c
   trunk/storage/sunone-invitation-list.c

Modified: trunk/calendar/cal-backend-wcap-events.c
==============================================================================
--- trunk/calendar/cal-backend-wcap-events.c	(original)
+++ trunk/calendar/cal-backend-wcap-events.c	Mon Feb 16 09:41:10 2009
@@ -703,7 +703,7 @@
 			icalcomponent_add_property (fb, prop);
 
 		*freebusy = g_list_append (*freebusy,
-				icalcomponent_as_ical_string (fb));
+				icalcomponent_as_ical_string_r (fb));
 	}
 
 	icalcomponent_free (icalcomp);

Modified: trunk/calendar/cal-backend-wcap.c
==============================================================================
--- trunk/calendar/cal-backend-wcap.c	(original)
+++ trunk/calendar/cal-backend-wcap.c	Mon Feb 16 09:41:10 2009
@@ -604,7 +604,7 @@
 	e_cal_component_free_range (&range);
 
 	if (icaltime_is_valid_time (tt) && !icaltime_is_null_time (tt))
-		return icaltime_as_ical_string (tt);
+		return icaltime_as_ical_string_r (tt);
 	else
 		return g_strdup ("0");
 }
@@ -1360,7 +1360,7 @@
 	icalcomponent_add_property (icalcomp, prop);
 
 	g_hash_table_foreach (priv->instances, build_calendar, icalcomp);
-	buf = icalcomponent_as_ical_string (icalcomp);
+	buf = icalcomponent_as_ical_string_r (icalcomp);
 	result = gnome_vfs_write (handle, buf, strlen (buf) * sizeof (char), &out);
 	g_free (buf);
 	icalcomponent_free (icalcomp);
@@ -2064,7 +2064,7 @@
 			*users = g_list_prepend (*users, tmp);
 	}
 	g_object_unref (comp);
-	*modified_calobj = icalcomponent_as_ical_string (top_level);
+	*modified_calobj = icalcomponent_as_ical_string_r (top_level);
  cleanup:	
 	icalcomponent_free (top_level);
 	
@@ -2618,7 +2618,7 @@
 	if (!vtzcomp)
 		return GNOME_Evolution_Calendar_OtherError;
 
-	*object = icalcomponent_as_ical_string (vtzcomp);
+	*object = icalcomponent_as_ical_string_r (vtzcomp);
 	return GNOME_Evolution_Calendar_Success;
 }
 

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Feb 16 09:41:10 2009
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
 
-AC_INIT(evolution-jescs, 2.25.1, http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-jescs)
+AC_INIT(evolution-jescs, 2.25.2, http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-jescs)
 AC_CONFIG_SRCDIR(README)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 

Modified: trunk/lib/sunone-connection.c
==============================================================================
--- trunk/lib/sunone-connection.c	(original)
+++ trunk/lib/sunone-connection.c	Mon Feb 16 09:41:10 2009
@@ -203,7 +203,7 @@
 		return;
 	}
 	
-	string = icaltime_as_ical_string (*dt->value);
+	string = icaltime_as_ical_string_r (*dt->value);
 	append_to_query (uri, param, string);	
 	g_free (string);
 	e_cal_component_free_datetime (dt);
@@ -353,7 +353,7 @@
 		
 		if (!dt->value)
 			continue;
-		tstr = icaltime_as_ical_string (*dt->value);
+		tstr = icaltime_as_ical_string_r (*dt->value);
 		
 		if (string) {
 			string = g_strconcat (string, ";", tstr, NULL);
@@ -380,7 +380,7 @@
 		struct icalrecurrencetype *recur = l->data;
 		char *tmp = string, *enc;
 
-		enc = query_encode (icalrecurrencetype_as_string (recur), FALSE, ";=");
+		enc = query_encode (icalrecurrencetype_as_string_r (recur), FALSE, ";=");
 		if (string) {
 			string = g_strconcat (string, ";\"", enc, "\"", NULL);
 			g_free (tmp);
@@ -539,10 +539,10 @@
 
 		e_cal_component_alarm_get_trigger (alarm, &trigger);
 		if (trigger.type == E_CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE)
-			dtstring = icaltime_as_ical_string (trigger.u.abs_time);
+			dtstring = icaltime_as_ical_string_r (trigger.u.abs_time);
 		else
 			dtstring =
-				g_strdup (icaldurationtype_as_ical_string (trigger.u.rel_duration));
+				g_strdup (icaldurationtype_as_ical_string_r (trigger.u.rel_duration));
 		
 		if (atype != NULL && dtstring != NULL) {
 			ECalComponentText text;
@@ -2162,11 +2162,11 @@
 	/* prepare the URI */
 	NEW_URI (fetch_uri);
 	if (!icaltime_is_null_time (dtstart))
-		tsstr = icaltime_as_ical_string (dtstart);
+		tsstr = icaltime_as_ical_string_r (dtstart);
 	else
 		tsstr = g_strdup ("0");
 	if (!icaltime_is_null_time (dtend))
-		testr = icaltime_as_ical_string (dtend);
+		testr = icaltime_as_ical_string_r (dtend);
 	else
 		testr = g_strdup ("0");
 	fetch_uri->path = g_strdup ("/fetchcomponents_by_lastmod.wcap");
@@ -2230,11 +2230,11 @@
 	/* prepare the URI */
 	NEW_URI (fetch_uri);
 	if (!icaltime_is_null_time (dtstart))
-		tsstr = icaltime_as_ical_string (dtstart);
+		tsstr = icaltime_as_ical_string_r (dtstart);
 	else
 		tsstr = g_strdup ("0");
 	if (!icaltime_is_null_time (dtend))
-		testr = icaltime_as_ical_string (dtend);
+		testr = icaltime_as_ical_string_r (dtend);
 	else
 		testr = g_strdup ("0");
 	fetch_uri->path = g_strdup ("/fetch_deletedcomponents.wcap");
@@ -2285,11 +2285,11 @@
 	/* prepare the URI */
 	NEW_URI (fetch_uri);
 	if (!icaltime_is_null_time (dtstart))
-		tsstr = icaltime_as_ical_string (dtstart);
+		tsstr = icaltime_as_ical_string_r (dtstart);
 	else
 		tsstr = g_strdup ("0");
 	if (!icaltime_is_null_time (dtend))
-		testr = icaltime_as_ical_string (dtend);
+		testr = icaltime_as_ical_string_r (dtend);
 	else
 		testr = g_strdup ("0");
 	fetch_uri->path = g_strdup ("/get_freebusy.wcap");
@@ -2323,11 +2323,11 @@
 		/* prepare the URI */
 		NEW_URI (fetch_uri);
 		if (!icaltime_is_null_time (dtstart))
-			tsstr = icaltime_as_ical_string (dtstart);
+			tsstr = icaltime_as_ical_string_r (dtstart);
 		else
 			tsstr = g_strdup ("0");
 		if (!icaltime_is_null_time (dtend))
-			testr = icaltime_as_ical_string (dtend);
+			testr = icaltime_as_ical_string_r (dtend);
 		else
 			testr = g_strdup ("0");
 		fetch_uri->path = g_strdup ("/get_freebusy.wcap");
@@ -2373,7 +2373,7 @@
 
 	IS_CONNECTED (connection, SOUP_STATUS_CANT_CONNECT);
 
-	ical_string = icalcomponent_as_ical_string (icalcomp);
+	ical_string = icalcomponent_as_ical_string_r (icalcomp);
 	if (!ical_string)
 		return SOUP_STATUS_CANCELLED;
 
@@ -2744,7 +2744,7 @@
 	/* Completed */
 	e_cal_component_get_completed (comp, &t);
 	if (t)
-		tstr = icaltime_as_ical_string (*t);
+		tstr = icaltime_as_ical_string_r (*t);
 	else
 		tstr = g_strdup ("0");
 	append_to_query (fetch_uri, "completed", tstr);

Modified: trunk/lib/sunone-util.c
==============================================================================
--- trunk/lib/sunone-util.c	(original)
+++ trunk/lib/sunone-util.c	Mon Feb 16 09:41:10 2009
@@ -102,7 +102,7 @@
 	e_cal_component_get_recurid (comp, &rid);	
 	if (!rid.datetime.value)
 		return;
-	tstr = icaltime_as_ical_string (*rid.datetime.value);
+	tstr = icaltime_as_ical_string_r (*rid.datetime.value);
 	e_cal_component_get_uid (comp, &uid);
 
 	new_uid = g_strconcat (uid, tstr, NULL);
@@ -127,7 +127,7 @@
 	e_cal_component_get_uid (comp, &uid);
 	
 	new_uid = g_strdup (uid);
-	rid_string = icaltime_as_ical_string (*rid.datetime.value);
+	rid_string = icaltime_as_ical_string_r (*rid.datetime.value);
 	new_uid[strlen (uid) - strlen (rid_string)] = '\0';	
 	g_free (rid_string);
 	e_cal_component_set_uid (comp, new_uid);

Modified: trunk/storage/sunone-invitation-list-model.c
==============================================================================
--- trunk/storage/sunone-invitation-list-model.c	(original)
+++ trunk/storage/sunone-invitation-list-model.c	Mon Feb 16 09:41:10 2009
@@ -724,7 +724,7 @@
 		wcap = sunone_connection_get_wcap (cnc, key);
 		g_free (key);
 		if (wcap) {
-			char *string = icalcomponent_as_ical_string (clonecomp);
+			char *string = icalcomponent_as_ical_string_r (clonecomp);
 
 			cal_backend_wcap_events_update_objects (E_CAL_BACKEND_SYNC (wcap),
 					NULL, string, CALOBJ_MOD_ALL, NULL, NULL);

Modified: trunk/storage/sunone-invitation-list.c
==============================================================================
--- trunk/storage/sunone-invitation-list.c	(original)
+++ trunk/storage/sunone-invitation-list.c	Mon Feb 16 09:41:10 2009
@@ -241,7 +241,7 @@
 
 	/* Send the icalendar code over */
 	top_level = toplevel_with_zones (list, comp);
-	string = icalcomponent_as_ical_string (top_level);
+	string = icalcomponent_as_ical_string_r (top_level);
 	set_data (BONOBO_WIDGET (priv->control), string);
 	g_free (string);
 	icalcomponent_free (top_level);