Adapt to the latest libical-glib API changeswip/mcrha/libical-glib

43 files changed, 328 insertions, 329 deletions

diff --git a/src/calendar/backends/caldav/e-cal-backend-caldav.c b/src/calendar/backends/caldav/e-cal-backend-caldav.c
index 6d8d5988b..ad44150cc 100644
--- a/src/calendar/backends/caldav/e-cal-backend-caldav.c
+++ b/src/calendar/backends/caldav/e-cal-backend-caldav.c
@@ -381,7 +381,7 @@ ecb_caldav_update_nfo_with_vcalendar (ECalMetaBackendInfo *nfo,
 	}
 
 	g_warn_if_fail (nfo->object == NULL);
-	nfo->object = i_cal_component_as_ical_string_r (vcalendar);
+	nfo->object = i_cal_component_as_ical_string (vcalendar);
 
 	if (!nfo->uid || !*(nfo->uid)) {
 		g_free (nfo->uid);
@@ -1263,7 +1263,7 @@ ecb_caldav_save_component_sync (ECalMetaBackend *meta_backend,
 		}
 	}
 
-	ical_string = i_cal_component_as_ical_string_r (vcalendar);
+	ical_string = i_cal_component_as_ical_string (vcalendar);
 
 	webdav = ecb_caldav_ref_session (cbdav);
 
@@ -1300,7 +1300,7 @@ ecb_caldav_save_component_sync (ECalMetaBackend *meta_backend,
 				ecb_caldav_store_component_etag (vcalendar, new_etag);
 
 				g_free (ical_string);
-				ical_string = i_cal_component_as_ical_string_r (vcalendar);
+				ical_string = i_cal_component_as_ical_string (vcalendar);
 
 				/* Encodes the href and the component into one string, which
 				   will be decoded in the load function */
@@ -1595,7 +1595,7 @@ ecb_caldav_extract_objects (ICalComponent *icomp,
 	kind = i_cal_component_isa (icomp);
 
 	if (kind == ekind) {
-		*out_objects = g_slist_prepend (NULL, i_cal_component_new_clone (icomp));
+		*out_objects = g_slist_prepend (NULL, i_cal_component_clone (icomp));
 		return;
 	}
 
@@ -1718,14 +1718,14 @@ ecb_caldav_get_free_busy_from_schedule_outbox_sync (ECalBackendCalDAV *cbdav,
 	g_free (str);
 
 	utc = i_cal_timezone_get_utc_timezone ();
-	dt = e_cal_component_datetime_new_take (i_cal_time_current_time_with_zone (utc), g_strdup (i_cal_timezone_get_tzid (utc)));
+	dt = e_cal_component_datetime_new_take (i_cal_time_new_current_with_zone (utc), g_strdup (i_cal_timezone_get_tzid (utc)));
 
 	e_cal_component_set_dtstamp (comp, e_cal_component_datetime_get_value (dt));
 
-	e_cal_component_datetime_take_value (dt, i_cal_time_from_timet_with_zone (start, FALSE, utc));
+	e_cal_component_datetime_take_value (dt, i_cal_time_new_from_timet_with_zone (start, FALSE, utc));
 	e_cal_component_set_dtstart (comp, dt);
 
-	e_cal_component_datetime_take_value (dt, i_cal_time_from_timet_with_zone (end, FALSE, utc));
+	e_cal_component_datetime_take_value (dt, i_cal_time_new_from_timet_with_zone (end, FALSE, utc));
 	e_cal_component_set_dtend (comp, dt);
 
 	e_cal_component_datetime_free (dt);
@@ -1778,9 +1778,9 @@ ecb_caldav_get_free_busy_from_schedule_outbox_sync (ECalBackendCalDAV *cbdav,
 	/* put the free/busy request to a VCALENDAR */
 	icomp = e_cal_util_new_top_level ();
 	i_cal_component_set_method (icomp, ICAL_METHOD_REQUEST);
-	i_cal_component_take_component (icomp, i_cal_component_new_clone (e_cal_component_get_icalcomponent (comp)));
+	i_cal_component_take_component (icomp, i_cal_component_clone (e_cal_component_get_icalcomponent (comp)));
 
-	str = i_cal_component_as_ical_string_r (icomp);
+	str = i_cal_component_as_ical_string (icomp);
 
 	g_object_unref (icomp);
 	g_object_unref (comp);
@@ -1828,7 +1828,7 @@ ecb_caldav_get_free_busy_from_schedule_outbox_sync (ECalBackendCalDAV *cbdav,
 							ecb_caldav_extract_objects (icomp, I_CAL_VFREEBUSY_COMPONENT, &objects, &local_error);
 						if (icomp && !local_error) {
 							for (link = objects; link; link = g_slist_next (link)) {
-								gchar *obj_str = i_cal_component_as_ical_string_r (link->data);
+								gchar *obj_str = i_cal_component_as_ical_string (link->data);
 
 								if (obj_str && *obj_str)
 									*out_freebusy = g_slist_prepend (*out_freebusy, obj_str);
@@ -1951,7 +1951,7 @@ ecb_caldav_get_free_busy_from_principal_sync (ECalBackendCalDAV *cbdav,
 					i_cal_component_take_property (subcomp, prop);
 				}
 
-				obj_str = i_cal_component_as_ical_string_r (subcomp);
+				obj_str = i_cal_component_as_ical_string (subcomp);
 
 				if (obj_str && *obj_str)
 					*out_freebusy = g_slist_prepend (*out_freebusy, obj_str);
diff --git a/src/calendar/backends/contacts/e-cal-backend-contacts.c b/src/calendar/backends/contacts/e-cal-backend-contacts.c
index 74936347f..270658405 100644
--- a/src/calendar/backends/contacts/e-cal-backend-contacts.c
+++ b/src/calendar/backends/contacts/e-cal-backend-contacts.c
@@ -703,7 +703,7 @@ contacts_removed_cb (EBookClientView *book_view,
 static ICalTime *
 cdate_to_icaltime (EContactDate *cdate)
 {
-	ICalTime *ret = i_cal_time_null_time ();
+	ICalTime *ret = i_cal_time_new_null_time ();
 
 	i_cal_time_set_year (ret, cdate->year);
 	i_cal_time_set_month (ret, cdate->month);
@@ -854,7 +854,7 @@ setup_alarm (ECalBackendContacts *cbc,
 	e_cal_component_alarm_take_description (alarm, summary);
 	e_cal_component_alarm_set_action (alarm, E_CAL_COMPONENT_ALARM_DISPLAY);
 
-	duration = i_cal_duration_null_duration ();
+	duration = i_cal_duration_new_null_duration ();
 	i_cal_duration_set_is_neg (duration, TRUE);
 
 	switch (cbc->priv->alarm_units) {
@@ -1143,15 +1143,15 @@ e_cal_backend_contacts_get_free_busy (ECalBackendSync *backend,
 	ICalTime *itt;
 	gchar *calobj;
 
-	itt = i_cal_time_from_timet_with_zone (start, FALSE, utc_zone);
+	itt = i_cal_time_new_from_timet_with_zone (start, FALSE, utc_zone);
 	i_cal_component_set_dtstart (vfb, itt);
 	g_object_unref (itt);
 
-	itt = i_cal_time_from_timet_with_zone (end, FALSE, utc_zone);
+	itt = i_cal_time_new_from_timet_with_zone (end, FALSE, utc_zone);
 	i_cal_component_set_dtend (vfb, itt);
 	g_object_unref (itt);
 
-	calobj = i_cal_component_as_ical_string_r (vfb);
+	calobj = i_cal_component_as_ical_string (vfb);
 	*freebusy = g_slist_append (NULL, calobj);
 	g_object_unref (vfb);
 }
diff --git a/src/calendar/backends/file/e-cal-backend-file.c b/src/calendar/backends/file/e-cal-backend-file.c
index 47078a7f0..8e86c25b3 100644
--- a/src/calendar/backends/file/e-cal-backend-file.c
+++ b/src/calendar/backends/file/e-cal-backend-file.c
@@ -202,7 +202,7 @@ save_file_when_idle (gpointer user_data)
 		goto error;
 	}
 
-	buf = i_cal_component_as_ical_string_r (priv->vcalendar);
+	buf = i_cal_component_as_ical_string (priv->vcalendar);
 	succeeded = g_output_stream_write_all (G_OUTPUT_STREAM (stream), buf, strlen (buf) * sizeof (gchar), NULL, NULL, &e);
 	g_free (buf);
 
@@ -1514,7 +1514,7 @@ add_detached_recur_to_vcalendar (gpointer key,
 
 	i_cal_component_take_component (
 		vcalendar,
-		i_cal_component_new_clone (e_cal_component_get_icalcomponent (recurrence)));
+		i_cal_component_clone (e_cal_component_get_icalcomponent (recurrence)));
 }
 
 /* Get_object_component handler for the file backend */
@@ -1571,7 +1571,7 @@ e_cal_backend_file_get_object (ECalBackendSync *backend,
 				return;
 			}
 
-			itt = i_cal_time_from_string (rid);
+			itt = i_cal_time_new_from_string (rid);
 			icomp = e_cal_util_construct_instance (
 				e_cal_component_get_icalcomponent (obj_data->full_object),
 				itt);
@@ -1583,7 +1583,7 @@ e_cal_backend_file_get_object (ECalBackendSync *backend,
 				return;
 			}
 
-			*object = i_cal_component_as_ical_string_r (icomp);
+			*object = i_cal_component_as_ical_string (icomp);
 
 			g_object_unref (icomp);
 		}
@@ -1598,12 +1598,12 @@ e_cal_backend_file_get_object (ECalBackendSync *backend,
 			if (obj_data->full_object)
 				i_cal_component_take_component (
 					icomp,
-					i_cal_component_new_clone (e_cal_component_get_icalcomponent (obj_data->full_object)));
+					i_cal_component_clone (e_cal_component_get_icalcomponent (obj_data->full_object)));
 
 			/* add all detached recurrences */
 			g_hash_table_foreach (obj_data->recurrences, (GHFunc) add_detached_recur_to_vcalendar, icomp);
 
-			*object = i_cal_component_as_ical_string_r (icomp);
+			*object = i_cal_component_as_ical_string (icomp);
 
 			g_object_unref (icomp);
 		} else if (obj_data->full_object)
@@ -1881,7 +1881,7 @@ e_cal_backend_file_get_attachment_uris (ECalBackendSync *backend,
 				return;
 			}
 
-			itt = i_cal_time_from_string (rid);
+			itt = i_cal_time_new_from_string (rid);
 			icomp = e_cal_util_construct_instance (
 				e_cal_component_get_icalcomponent (obj_data->full_object),
 				itt);
@@ -2016,7 +2016,7 @@ free_busy_instance (ICalComponent *icomp,
 	ICalPeriod *ipt;
 	const gchar *summary, *location;
 
-	ipt = i_cal_period_null_period ();
+	ipt = i_cal_period_new_null_period ();
 	i_cal_period_set_start (ipt, instance_start);
 	i_cal_period_set_end (ipt, instance_end);
 
@@ -2074,10 +2074,10 @@ create_user_free_busy (ECalBackendFile *cbfile,
 	}
 	utc_zone = i_cal_timezone_get_utc_timezone ();
 
-	starttt = i_cal_time_from_timet_with_zone (start, FALSE, utc_zone);
+	starttt = i_cal_time_new_from_timet_with_zone (start, FALSE, utc_zone);
 	i_cal_component_set_dtstart (vfb, starttt);
 
-	endtt = i_cal_time_from_timet_with_zone (end, FALSE, utc_zone);
+	endtt = i_cal_time_new_from_timet_with_zone (end, FALSE, utc_zone);
 	i_cal_component_set_dtend (vfb, endtt);
 
 	/* add all objects in the given interval */
@@ -2186,7 +2186,7 @@ e_cal_backend_file_get_free_busy (ECalBackendSync *backend,
 	if (users == NULL) {
 		if (e_cal_backend_mail_account_get_default (registry, &address, &name)) {
 			vfb = create_user_free_busy (cbfile, address, name, start, end, cancellable);
-			calobj = i_cal_component_as_ical_string_r (vfb);
+			calobj = i_cal_component_as_ical_string (vfb);
 			*freebusy = g_slist_append (*freebusy, calobj);
 			g_object_unref (vfb);
 			g_free (address);
@@ -2197,7 +2197,7 @@ e_cal_backend_file_get_free_busy (ECalBackendSync *backend,
 			address = l->data;
 			if (e_cal_backend_mail_account_is_valid (registry, address, &name)) {
 				vfb = create_user_free_busy (cbfile, address, name, start, end, cancellable);
-				calobj = i_cal_component_as_ical_string_r (vfb);
+				calobj = i_cal_component_as_ical_string (vfb);
 				*freebusy = g_slist_append (*freebusy, calobj);
 				g_object_unref (vfb);
 				g_free (name);
@@ -2350,7 +2350,7 @@ e_cal_backend_file_create_objects (ECalBackendSync *backend,
 			continue;
 
 		/* Set the created and last modified times on the component, if not there already */
-		current = i_cal_time_current_time_with_zone (i_cal_timezone_get_utc_timezone ());
+		current = i_cal_time_new_current_with_zone (i_cal_timezone_get_utc_timezone ());
 
 		if (!e_cal_util_component_has_property (icomp, I_CAL_CREATED_PROPERTY)) {
 			/* Update both when CREATED is missing, to make sure the LAST-MODIFIED
@@ -2406,7 +2406,7 @@ remove_object_instance_cb (gpointer key,
 	ECalComponent *instance = value;
 	RemoveRecurrenceData *rrdata = user_data;
 
-	itt = i_cal_time_from_string (rrdata->rid);
+	itt = i_cal_time_new_from_string (rrdata->rid);
 	fromtt = i_cal_time_as_timet (itt);
 	g_object_unref (itt);
 
@@ -2538,7 +2538,7 @@ e_cal_backend_file_modify_objects (ECalBackendSync *backend,
 		obj_data = g_hash_table_lookup (priv->comp_uid_hash, comp_uid);
 
 		/* Set the last modified time on the component */
-		current = i_cal_time_current_time_with_zone (i_cal_timezone_get_utc_timezone ());
+		current = i_cal_time_new_current_with_zone (i_cal_timezone_get_utc_timezone ());
 		e_cal_component_set_last_modified (comp, current);
 		g_object_unref (current);
 
@@ -2906,7 +2906,7 @@ remove_instance (ECalBackendFile *cbfile,
 			*old_comp = e_cal_component_clone (obj_data->full_object);
 		}
 
-		rid_struct = i_cal_time_from_string (rid);
+		rid_struct = i_cal_time_new_from_string (rid);
 		if (!i_cal_time_get_timezone (rid_struct)) {
 			ICalTime *master_dtstart = i_cal_component_get_dtstart (e_cal_component_get_icalcomponent (obj_data->full_object));
 
@@ -2925,7 +2925,7 @@ remove_instance (ECalBackendFile *cbfile,
 
 		/* Since we are only removing one instance of recurrence
 		 * event, update the last modified time on the component */
-		current = i_cal_time_current_time_with_zone (i_cal_timezone_get_utc_timezone ());
+		current = i_cal_time_new_current_with_zone (i_cal_timezone_get_utc_timezone ());
 		e_cal_component_set_last_modified (obj_data->full_object, current);
 		g_object_unref (current);
 
@@ -3140,7 +3140,7 @@ e_cal_backend_file_remove_objects (ECalBackendSync *backend,
 					e_cal_component_get_icalcomponent (comp));
 				priv->comp = g_list_remove (priv->comp, comp);
 
-				rid_struct = i_cal_time_from_string (recur_id);
+				rid_struct = i_cal_time_new_from_string (recur_id);
 				if (!i_cal_time_get_timezone (rid_struct)) {
 					ICalTime *master_dtstart = i_cal_component_get_dtstart (e_cal_component_get_icalcomponent (comp));
 
@@ -3515,7 +3515,7 @@ e_cal_backend_file_receive_objects (ECalBackendSync *backend,
 			continue;
 
 		/* Set the created and last modified times on the component, if not there already */
-		current = i_cal_time_current_time_with_zone (i_cal_timezone_get_utc_timezone ());
+		current = i_cal_time_new_current_with_zone (i_cal_timezone_get_utc_timezone ());
 
 		if (!e_cal_util_component_has_property (subcomp, ICAL_CREATED_PROPERTY)) {
 			/* Update both when CREATED is missing, to make sure the LAST-MODIFIED
@@ -3750,7 +3750,7 @@ cal_backend_file_add_cached_timezone (ETimezoneCache *cache,
 
 		tz_comp = i_cal_timezone_get_component (zone);
 
-		i_cal_component_take_component (priv->vcalendar, i_cal_component_new_clone (tz_comp));
+		i_cal_component_take_component (priv->vcalendar, i_cal_component_clone (tz_comp));
 
 		g_clear_object (&tz_comp);
 
diff --git a/src/calendar/backends/gtasks/e-cal-backend-gtasks.c b/src/calendar/backends/gtasks/e-cal-backend-gtasks.c
index d9dd332e4..86dbff83c 100644
--- a/src/calendar/backends/gtasks/e-cal-backend-gtasks.c
+++ b/src/calendar/backends/gtasks/e-cal-backend-gtasks.c
@@ -117,14 +117,14 @@ ecb_gtasks_gdata_to_comp (GDataTasksTask *task)
 
 	utc_zone = i_cal_timezone_get_utc_timezone ();
 
-	tt = i_cal_time_from_timet_with_zone (gdata_entry_get_published (entry), 0, utc_zone);
+	tt = i_cal_time_new_from_timet_with_zone (gdata_entry_get_published (entry), 0, utc_zone);
 	if (!tt || !i_cal_time_is_valid_time (tt) || i_cal_time_is_null_time (tt)) {
 		g_clear_object (&tt);
-		tt = i_cal_time_from_timet_with_zone (gdata_entry_get_updated (entry), 0, utc_zone);
+		tt = i_cal_time_new_from_timet_with_zone (gdata_entry_get_updated (entry), 0, utc_zone);
 	}
 	if (!tt || !i_cal_time_is_valid_time (tt) || i_cal_time_is_null_time (tt)) {
 		g_clear_object (&tt);
-		tt = i_cal_time_current_time_with_zone (utc_zone);
+		tt = i_cal_time_new_current_with_zone (utc_zone);
 	}
 
 	ecb_gtasks_update_ical_time_property (icomp, I_CAL_CREATED_PROPERTY,
@@ -134,10 +134,10 @@ ecb_gtasks_gdata_to_comp (GDataTasksTask *task)
 
 	g_clear_object (&tt);
 
-	tt = i_cal_time_from_timet_with_zone (gdata_entry_get_updated (entry), 0, utc_zone);
+	tt = i_cal_time_new_from_timet_with_zone (gdata_entry_get_updated (entry), 0, utc_zone);
 	if (!tt || !i_cal_time_is_valid_time (tt) || i_cal_time_is_null_time (tt)) {
 		g_clear_object (&tt);
-		tt = i_cal_time_current_time_with_zone (utc_zone);
+		tt = i_cal_time_new_current_with_zone (utc_zone);
 	}
 	i_cal_component_set_dtstamp (icomp, tt);
 
@@ -149,14 +149,14 @@ ecb_gtasks_gdata_to_comp (GDataTasksTask *task)
 	g_clear_object (&tt);
 
 	if (gdata_tasks_task_get_due (task) > 0) {
-		tt = i_cal_time_from_timet_with_zone (gdata_tasks_task_get_due (task), 1, NULL);
+		tt = i_cal_time_new_from_timet_with_zone (gdata_tasks_task_get_due (task), 1, NULL);
 		if (tt && i_cal_time_is_valid_time (tt) && !i_cal_time_is_null_time (tt))
 			i_cal_component_set_due (icomp, tt);
 		g_clear_object (&tt);
 	}
 
 	if (gdata_tasks_task_get_completed (task) > 0) {
-		tt = i_cal_time_from_timet_with_zone (gdata_tasks_task_get_completed (task), 0, utc_zone);
+		tt = i_cal_time_new_from_timet_with_zone (gdata_tasks_task_get_completed (task), 0, utc_zone);
 		if (tt && i_cal_time_is_valid_time (tt) && !i_cal_time_is_null_time (tt)) {
 			ecb_gtasks_update_ical_time_property (icomp, I_CAL_COMPLETED_PROPERTY,
 				i_cal_property_new_completed,
@@ -847,7 +847,7 @@ ecb_gtasks_load_component_sync (ECalMetaBackend *meta_backend,
 
 			icomp = e_cal_component_get_icalcomponent (comp);
 			if (icomp)
-				*out_instances = i_cal_component_new_clone (icomp);
+				*out_instances = i_cal_component_clone (icomp);
 
 			g_hash_table_remove (cbgtasks->priv->preloaded, uid);
 
@@ -1062,7 +1062,7 @@ ecb_gtasks_dup_component_revision (ECalCache *cal_cache,
 		ICalTime *itt;
 
 		itt = i_cal_property_get_lastmodified (prop);
-		revision = i_cal_time_as_ical_string_r (itt);
+		revision = i_cal_time_as_ical_string (itt);
 		g_clear_object (&itt);
 		g_object_unref (prop);
 	}
diff --git a/src/calendar/backends/http/e-cal-backend-http.c b/src/calendar/backends/http/e-cal-backend-http.c
index 6b722be15..0383ff58b 100644
--- a/src/calendar/backends/http/e-cal-backend-http.c
+++ b/src/calendar/backends/http/e-cal-backend-http.c
@@ -538,7 +538,7 @@ ecb_http_list_existing_sync (ECalMetaBackend *meta_backend,
 
 		uid = i_cal_component_get_uid (icomp);
 		revision = e_cal_cache_dup_component_revision (cal_cache, icomp);
-		object = i_cal_component_as_ical_string_r (value);
+		object = i_cal_component_as_ical_string (value);
 
 		nfo = e_cal_meta_backend_info_new (uid, revision, object, NULL);
 
diff --git a/src/calendar/backends/weather/e-cal-backend-weather.c b/src/calendar/backends/weather/e-cal-backend-weather.c
index 066582768..8c4208db9 100644
--- a/src/calendar/backends/weather/e-cal-backend-weather.c
+++ b/src/calendar/backends/weather/e-cal-backend-weather.c
@@ -486,7 +486,7 @@ create_weather (ECalBackendWeather *cbw,
 
 	/* Set all-day event's date from forecast data - cannot set is_date,
 	 * because in that case no timezone conversion is done */
-	itt = i_cal_time_from_timet_with_zone (update_time, 0, update_zone);
+	itt = i_cal_time_new_from_timet_with_zone (update_time, 0, update_zone);
 	i_cal_time_set_hour (itt, 0);
 	i_cal_time_set_minute (itt, 0);
 	i_cal_time_set_second (itt, 0);
@@ -859,15 +859,15 @@ e_cal_backend_weather_get_free_busy (ECalBackendSync *backend,
 	ICalTime *itt;
 	gchar *calobj;
 
-	itt = i_cal_time_from_timet_with_zone (start, FALSE, utc_zone);
+	itt = i_cal_time_new_from_timet_with_zone (start, FALSE, utc_zone);
 	i_cal_component_set_dtstart (vfb, itt);
 	g_object_unref (itt);
 
-	itt = i_cal_time_from_timet_with_zone (end, FALSE, utc_zone);
+	itt = i_cal_time_new_from_timet_with_zone (end, FALSE, utc_zone);
 	i_cal_component_set_dtend (vfb, itt);
 	g_object_unref (itt);
 
-	calobj = i_cal_component_as_ical_string_r (vfb);
+	calobj = i_cal_component_as_ical_string (vfb);
 	*freebusy = g_slist_append (NULL, calobj);
 	g_object_unref (vfb);
 }
diff --git a/src/calendar/libecal/e-cal-check-timezones.c b/src/calendar/libecal/e-cal-check-timezones.c
index a21aa9d0c..65db02acd 100644
--- a/src/calendar/libecal/e-cal-check-timezones.c
+++ b/src/calendar/libecal/e-cal-check-timezones.c
@@ -198,7 +198,7 @@ addsystemtz (gpointer key,
 
 		zone_comp = i_cal_timezone_get_component (zone);
 		if (zone_comp) {
-			i_cal_component_take_component (vcalendar, i_cal_component_new_clone (zone_comp));
+			i_cal_component_take_component (vcalendar, i_cal_component_clone (zone_comp));
 			g_object_unref (zone_comp);
 		}
 	}
@@ -316,7 +316,7 @@ e_cal_client_check_timezones_sync (ICalComponent *vcalendar,
 				} else {
 					gint counter;
 
-					zonestr = i_cal_component_as_ical_string_r (subcomp);
+					zonestr = i_cal_component_as_ical_string (subcomp);
 
 					/* check for collisions with existing timezones */
 					for (counter = 0;
@@ -342,7 +342,7 @@ e_cal_client_check_timezones_sync (ICalComponent *vcalendar,
 						}
 						g_free (buffer);
 						zone_comp = i_cal_timezone_get_component (existing_zone);
-						buffer = zone_comp ? i_cal_component_as_ical_string_r (zone_comp) : NULL;
+						buffer = zone_comp ? i_cal_component_as_ical_string (zone_comp) : NULL;
 						g_clear_object (&zone_comp);
 						g_clear_object (&existing_zone);
 
diff --git a/src/calendar/libecal/e-cal-client.c b/src/calendar/libecal/e-cal-client.c
index 409334bda..8b7622d3d 100644
--- a/src/calendar/libecal/e-cal-client.c
+++ b/src/calendar/libecal/e-cal-client.c
@@ -1498,7 +1498,7 @@ cal_client_get_cached_timezone (ETimezoneCache *cache,
 	 * lead to broken VCALENDARs in the caller. */
 
 	icalcomp = i_cal_timezone_get_component (builtin_zone);
-	clone = i_cal_component_new_clone (icalcomp);
+	clone = i_cal_component_clone (icalcomp);
 	g_object_unref (icalcomp);
 	icalcomp = clone;
 
@@ -2199,7 +2199,7 @@ add_instance_cb (ICalComponent *icomp,
 	ci = g_new0 (struct comp_instance, 1);
 
 	/* add the instance to the list */
-	ci->comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (icomp));
+	ci->comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (icomp));
 	if (!ci->comp) {
 		comp_instance_free (ci);
 		return FALSE;
@@ -2229,8 +2229,8 @@ add_instance_cb (ICalComponent *icomp,
 		e_cal_component_datetime_free (dtend);
 	}
 
-	ci->start = i_cal_time_new_clone (start);
-	ci->end = i_cal_time_new_clone (end);
+	ci->start = i_cal_time_clone (start);
+	ci->end = i_cal_time_clone (end);
 
 	*list = g_slist_prepend (*list, ci);
 
@@ -2345,8 +2345,8 @@ process_detached_instances (GSList *instances,
 					g_clear_object (&ci->start);
 					g_clear_object (&ci->end);
 					ci->comp = g_object_ref (cid->comp);
-					ci->start = i_cal_time_new_clone (cid->start);
-					ci->end = i_cal_time_new_clone (cid->end);
+					ci->start = i_cal_time_clone (cid->start);
+					ci->end = i_cal_time_clone (cid->end);
 
 					processed = TRUE;
 				} else {
@@ -2380,8 +2380,8 @@ process_detached_instances (GSList *instances,
 		cid = unprocessed_instances->data;
 		ci = g_new0 (struct comp_instance, 1);
 		ci->comp = g_object_ref (cid->comp);
-		ci->start = i_cal_time_new_clone (cid->start);
-		ci->end = i_cal_time_new_clone (cid->end);
+		ci->start = i_cal_time_clone (cid->start);
+		ci->end = i_cal_time_clone (cid->end);
 		instances = g_slist_append (instances, ci);
 
 		unprocessed_instances = g_slist_remove (unprocessed_instances, cid);
@@ -2414,8 +2414,8 @@ generate_instances (ECalClient *client,
 	else
 		default_zone = i_cal_timezone_get_utc_timezone ();
 
-	starttt = i_cal_time_from_timet_with_zone (start, FALSE, NULL);
-	endtt = i_cal_time_from_timet_with_zone (end, FALSE, NULL);
+	starttt = i_cal_time_new_from_timet_with_zone (start, FALSE, NULL);
+	endtt = i_cal_time_new_from_timet_with_zone (end, FALSE, NULL);
 
 	for (l = objects; l && !g_cancellable_is_cancelled (cancellable); l = l->next) {
 		ECalComponent *comp;
@@ -2442,12 +2442,12 @@ generate_instances (ECalClient *client,
 				continue;
 			}
 
-			ci->start = i_cal_time_new_clone (e_cal_component_datetime_get_value (dtstart));
+			ci->start = i_cal_time_clone (e_cal_component_datetime_get_value (dtstart));
 
 			if (dtend && e_cal_component_datetime_get_value (dtend))
-				ci->end = i_cal_time_new_clone (e_cal_component_datetime_get_value (dtend));
+				ci->end = i_cal_time_clone (e_cal_component_datetime_get_value (dtend));
 			else {
-				ci->end = i_cal_time_new_clone (ci->start);
+				ci->end = i_cal_time_clone (ci->start);
 
 				if (i_cal_time_is_date (e_cal_component_datetime_get_value (dtstart)))
 					i_cal_time_adjust (ci->end, 1, 0, 0, 0);
@@ -2968,7 +2968,7 @@ e_cal_client_generate_instances_for_object (ECalClient *client,
 		return;
 	}
 
-	comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (icalcomp));
+	comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (icalcomp));
 	g_return_if_fail (comp != NULL);
 
 	uid = e_cal_component_get_uid (comp);
@@ -3051,7 +3051,7 @@ e_cal_client_generate_instances_for_object_sync (ECalClient *client,
 		return;
 	}
 
-	comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (icalcomp));
+	comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (icalcomp));
 	g_return_if_fail (comp != NULL);
 
 	uid = e_cal_component_get_uid (comp);
@@ -3111,7 +3111,7 @@ foreach_tzid_callback (ICalParameter *param,
 	if (!vtimezone_comp)
 		return;
 
-	vtimezone_as_string = i_cal_component_as_ical_string_r (vtimezone_comp);
+	vtimezone_as_string = i_cal_component_as_ical_string (vtimezone_comp);
 
 	g_hash_table_insert (data->timezone_hash, (gchar *) tzid, vtimezone_as_string);
 }
@@ -3190,7 +3190,7 @@ e_cal_client_get_component_as_string (ECalClient *client,
 	g_hash_table_foreach (timezone_hash, append_timezone_string, vcal_string);
 
 	/* Get the string for the VEVENT/VTODO. */
-	obj_string = i_cal_component_as_ical_string_r (icalcomp);
+	obj_string = i_cal_component_as_ical_string (icalcomp);
 
 	/* If there were any timezones to send, create a complete VCALENDAR,
 	 * else just send the VEVENT/VTODO string. */
@@ -3636,7 +3636,7 @@ e_cal_client_get_object_sync (ECalClient *client,
 		if (subcomponent != NULL) {
 			ICalComponent *clone;
 
-			clone = i_cal_component_new_clone (subcomponent);
+			clone = i_cal_component_clone (subcomponent);
 			g_object_unref (subcomponent);
 			subcomponent = clone;
 		}
@@ -3875,7 +3875,7 @@ e_cal_client_get_objects_for_uid_sync (ECalClient *client,
 		     g_object_unref (subcomponent), subcomponent = i_cal_component_get_next_component (icalcomp, kind)) {
 			ECalComponent *comp;
 
-			comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (subcomponent));
+			comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (subcomponent));
 			if (comp)
 				tmp = g_slist_prepend (tmp, comp);
 		}
@@ -4531,7 +4531,7 @@ e_cal_client_create_object (ECalClient *client,
 	g_return_if_fail (icalcomp != NULL);
 
 	async_context = g_slice_new0 (AsyncContext);
-	async_context->in_comp = i_cal_component_new_clone (icalcomp);
+	async_context->in_comp = i_cal_component_clone (icalcomp);
 	async_context->opflags = opflags;
 
 	simple = g_simple_async_result_new (
@@ -4709,7 +4709,7 @@ e_cal_client_create_objects (ECalClient *client,
 
 	async_context = g_slice_new0 (AsyncContext);
 	async_context->comp_list = g_slist_copy_deep (
-		icalcomps, (GCopyFunc) i_cal_component_new_clone, NULL);
+		icalcomps, (GCopyFunc) i_cal_component_clone, NULL);
 	async_context->opflags = opflags;
 
 	simple = g_simple_async_result_new (
@@ -4814,7 +4814,7 @@ e_cal_client_create_objects_sync (ECalClient *client,
 	while (icalcomps != NULL) {
 		gchar *ical_string;
 
-		ical_string = i_cal_component_as_ical_string_r (icalcomps->data);
+		ical_string = i_cal_component_as_ical_string (icalcomps->data);
 		strv[ii++] = e_util_utf8_make_valid (ical_string);
 		g_free (ical_string);
 
@@ -4926,7 +4926,7 @@ e_cal_client_modify_object (ECalClient *client,
 	g_return_if_fail (icalcomp != NULL);
 
 	async_context = g_slice_new0 (AsyncContext);
-	async_context->in_comp = i_cal_component_new_clone (icalcomp);
+	async_context->in_comp = i_cal_component_clone (icalcomp);
 	async_context->mod = mod;
 	async_context->opflags = opflags;
 
@@ -5083,7 +5083,7 @@ e_cal_client_modify_objects (ECalClient *client,
 
 	async_context = g_slice_new0 (AsyncContext);
 	async_context->comp_list = g_slist_copy_deep (
-		icalcomps, (GCopyFunc) i_cal_component_new_clone, NULL);
+		icalcomps, (GCopyFunc) i_cal_component_clone, NULL);
 	async_context->mod = mod;
 	async_context->opflags = opflags;
 
@@ -5187,7 +5187,7 @@ e_cal_client_modify_objects_sync (ECalClient *client,
 	while (icalcomps != NULL) {
 		gchar *ical_string;
 
-		ical_string = i_cal_component_as_ical_string_r (icalcomps->data);
+		ical_string = i_cal_component_as_ical_string (icalcomps->data);
 		strv[ii++] = e_util_utf8_make_valid (ical_string);
 		g_free (ical_string);
 
@@ -5669,7 +5669,7 @@ e_cal_client_receive_objects (ECalClient *client,
 	g_return_if_fail (icalcomp != NULL);
 
 	async_context = g_slice_new0 (AsyncContext);
-	async_context->in_comp = i_cal_component_new_clone (icalcomp);
+	async_context->in_comp = i_cal_component_clone (icalcomp);
 	async_context->opflags = opflags;
 
 	simple = g_simple_async_result_new (
@@ -5747,7 +5747,7 @@ e_cal_client_receive_objects_sync (ECalClient *client,
 
 	g_return_val_if_fail (E_IS_CAL_CLIENT (client), FALSE);
 
-	ical_string = i_cal_component_as_ical_string_r (icalcomp);
+	ical_string = i_cal_component_as_ical_string (icalcomp);
 	utf8_ical_string = e_util_utf8_make_valid (ical_string);
 
 	e_dbus_calendar_call_receive_objects_sync (
@@ -5827,7 +5827,7 @@ e_cal_client_send_objects (ECalClient *client,
 	g_return_if_fail (icalcomp != NULL);
 
 	async_context = g_slice_new0 (AsyncContext);
-	async_context->in_comp = i_cal_component_new_clone (icalcomp);
+	async_context->in_comp = i_cal_component_clone (icalcomp);
 	async_context->opflags = opflags;
 
 	simple = g_simple_async_result_new (
@@ -5943,7 +5943,7 @@ e_cal_client_send_objects_sync (ECalClient *client,
 	g_return_val_if_fail (out_users != NULL, FALSE);
 	g_return_val_if_fail (out_modified_icalcomp != NULL, FALSE);
 
-	ical_string = i_cal_component_as_ical_string_r (icalcomp);
+	ical_string = i_cal_component_as_ical_string (icalcomp);
 	utf8_ical_string = e_util_utf8_make_valid (ical_string);
 
 	e_dbus_calendar_call_send_objects_sync (
@@ -6935,7 +6935,7 @@ e_cal_client_add_timezone_sync (ECalClient *client,
 		return FALSE;
 	}
 
-	zone_str = i_cal_component_as_ical_string_r (icalcomp);
+	zone_str = i_cal_component_as_ical_string (icalcomp);
 	utf8_zone_str = e_util_utf8_make_valid (zone_str);
 
 	e_dbus_calendar_call_add_timezone_sync (
diff --git a/src/calendar/libecal/e-cal-component-alarm-repeat.c b/src/calendar/libecal/e-cal-component-alarm-repeat.c
index 68ef6fa71..f697e00d0 100644
--- a/src/calendar/libecal/e-cal-component-alarm-repeat.c
+++ b/src/calendar/libecal/e-cal-component-alarm-repeat.c
@@ -79,7 +79,7 @@ e_cal_component_alarm_repeat_new_seconds (gint repetitions,
 
 	repeat = g_new0 (ECalComponentAlarmRepeat, 1);
 	repeat->repetitions = repetitions;
-	repeat->interval = i_cal_duration_from_int (interval_seconds);
+	repeat->interval = i_cal_duration_new_from_int (interval_seconds);
 
 	return repeat;
 }
@@ -237,6 +237,6 @@ e_cal_component_alarm_repeat_set_interval_seconds (ECalComponentAlarmRepeat *rep
 
 	if (i_cal_duration_as_int (repeat->interval) != interval_seconds) {
 		g_clear_object (&repeat->interval);
-		repeat->interval = i_cal_duration_from_int (interval_seconds);
+		repeat->interval = i_cal_duration_new_from_int (interval_seconds);
 	}
 }
diff --git a/src/calendar/libecal/e-cal-component-alarm-trigger.c b/src/calendar/libecal/e-cal-component-alarm-trigger.c
index 00bbfb5a0..2f073e531 100644
--- a/src/calendar/libecal/e-cal-component-alarm-trigger.c
+++ b/src/calendar/libecal/e-cal-component-alarm-trigger.c
@@ -342,7 +342,7 @@ e_cal_component_alarm_trigger_fill_property (const ECalComponentAlarmTrigger *tr
 	g_return_if_fail (i_cal_property_isa (property) == I_CAL_TRIGGER_PROPERTY);
 
 	related = I_CAL_RELATED_START;
-	trg = i_cal_trigger_from_int (0);
+	trg = i_cal_trigger_new_from_int (0);
 
 	switch (trigger->kind) {
 	case E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START:
@@ -421,7 +421,7 @@ e_cal_component_alarm_trigger_set_relative (ECalComponentAlarmTrigger *trigger,
 	g_clear_object (&trigger->abs_time);
 
 	trigger->kind = kind;
-	trigger->rel_duration = i_cal_duration_from_int (
+	trigger->rel_duration = i_cal_duration_new_from_int (
 		i_cal_duration_as_int ((ICalDuration *) duration));
 }
 
@@ -449,7 +449,7 @@ e_cal_component_alarm_trigger_set_absolute (ECalComponentAlarmTrigger *trigger,
 	g_clear_object (&trigger->abs_time);
 
 	trigger->kind = E_CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE;
-	trigger->abs_time = i_cal_time_new_clone (absolute_time);
+	trigger->abs_time = i_cal_time_clone (absolute_time);
 }
 
 /**
@@ -540,7 +540,7 @@ e_cal_component_alarm_trigger_set_duration (ECalComponentAlarmTrigger *trigger,
 	if (trigger->rel_duration != duration &&
 	    i_cal_duration_as_int (trigger->rel_duration) != i_cal_duration_as_int ((ICalDuration *) duration)) {
 		g_clear_object (&trigger->rel_duration);
-		trigger->rel_duration = i_cal_duration_from_int (
+		trigger->rel_duration = i_cal_duration_new_from_int (
 			i_cal_duration_as_int ((ICalDuration *) duration));
 	}
 }
@@ -592,7 +592,7 @@ e_cal_component_alarm_trigger_set_absolute_time (ECalComponentAlarmTrigger *trig
 
 	if (trigger->abs_time != absolute_time) {
 		g_clear_object (&trigger->abs_time);
-		trigger->abs_time = i_cal_time_new_clone ((ICalTime *) absolute_time);
+		trigger->abs_time = i_cal_time_clone ((ICalTime *) absolute_time);
 	}
 }
 
diff --git a/src/calendar/libecal/e-cal-component-datetime.c b/src/calendar/libecal/e-cal-component-datetime.c
index 668bf39f6..3f724e858 100644
--- a/src/calendar/libecal/e-cal-component-datetime.c
+++ b/src/calendar/libecal/e-cal-component-datetime.c
@@ -198,7 +198,7 @@ e_cal_component_datetime_set_value (ECalComponentDateTime *dt,
 
 	if (dt->value != value) {
 		g_clear_object (&dt->value);
-		dt->value = i_cal_time_new_clone (value);
+		dt->value = i_cal_time_clone (value);
 	}
 }
 
diff --git a/src/calendar/libecal/e-cal-component-parameter-bag.c b/src/calendar/libecal/e-cal-component-parameter-bag.c
index ed8418bfe..95437c864 100644
--- a/src/calendar/libecal/e-cal-component-parameter-bag.c
+++ b/src/calendar/libecal/e-cal-component-parameter-bag.c
@@ -191,7 +191,7 @@ e_cal_component_parameter_bag_fill_property (const ECalComponentParameterBag *ba
 		ICalParameter *param = g_ptr_array_index (bag->parameters, ii);
 
 		if (param)
-			i_cal_property_take_parameter (property, i_cal_parameter_new_clone (param));
+			i_cal_property_take_parameter (property, i_cal_parameter_clone (param));
 	}
 }
 
@@ -244,7 +244,7 @@ e_cal_component_parameter_bag_add (ECalComponentParameterBag *bag,
 	g_return_if_fail (I_CAL_IS_PARAMETER (param));
 
 	e_cal_component_parameter_bag_take (bag,
-		i_cal_parameter_new_clone ((ICalParameter *) param));
+		i_cal_parameter_clone ((ICalParameter *) param));
 }
 
 /**
diff --git a/src/calendar/libecal/e-cal-component-period.c b/src/calendar/libecal/e-cal-component-period.c
index 377f312c4..860c7780e 100644
--- a/src/calendar/libecal/e-cal-component-period.c
+++ b/src/calendar/libecal/e-cal-component-period.c
@@ -269,7 +269,7 @@ e_cal_component_period_set_start (ECalComponentPeriod *period,
 
 	if (period->start != start) {
 		g_clear_object (&period->start);
-		period->start = i_cal_time_new_clone (start);
+		period->start = i_cal_time_clone (start);
 	}
 }
 
@@ -318,7 +318,7 @@ e_cal_component_period_set_end (ECalComponentPeriod *period,
 	if (period->end != end) {
 		g_clear_object (&period->end);
 		if (end)
-			period->end = i_cal_time_new_clone (end);
+			period->end = i_cal_time_clone (end);
 	}
 }
 
@@ -364,6 +364,6 @@ e_cal_component_period_set_duration (ECalComponentPeriod *period,
 
 	if (period->duration != duration) {
 		g_clear_object (&period->duration);
-		period->duration = i_cal_duration_from_int (i_cal_duration_as_int ((ICalDuration *) duration));
+		period->duration = i_cal_duration_new_from_int (i_cal_duration_as_int ((ICalDuration *) duration));
 	}
 }
diff --git a/src/calendar/libecal/e-cal-component-property-bag.c b/src/calendar/libecal/e-cal-component-property-bag.c
index 4311bdd7a..cec7538d7 100644
--- a/src/calendar/libecal/e-cal-component-property-bag.c
+++ b/src/calendar/libecal/e-cal-component-property-bag.c
@@ -191,7 +191,7 @@ e_cal_component_property_bag_fill_component (const ECalComponentPropertyBag *bag
 		ICalProperty *prop = g_ptr_array_index (bag->properties, ii);
 
 		if (prop)
-			i_cal_component_take_property (component, i_cal_property_new_clone (prop));
+			i_cal_component_take_property (component, i_cal_property_clone (prop));
 	}
 }
 
@@ -244,7 +244,7 @@ e_cal_component_property_bag_add (ECalComponentPropertyBag *bag,
 	g_return_if_fail (I_CAL_IS_PROPERTY (prop));
 
 	e_cal_component_property_bag_take (bag,
-		i_cal_property_new_clone ((ICalProperty *) prop));
+		i_cal_property_clone ((ICalProperty *) prop));
 }
 
 /**
diff --git a/src/calendar/libecal/e-cal-component.c b/src/calendar/libecal/e-cal-component.c
index 6056468a2..0db31a276 100644
--- a/src/calendar/libecal/e-cal-component.c
+++ b/src/calendar/libecal/e-cal-component.c
@@ -382,7 +382,7 @@ e_cal_component_clone (ECalComponent *comp)
 	new_comp = e_cal_component_new ();
 
 	if (comp->priv->icalcomp) {
-		new_icalcomp = i_cal_component_new_clone (comp->priv->icalcomp);
+		new_icalcomp = i_cal_component_clone (comp->priv->icalcomp);
 		if (!new_icalcomp || !e_cal_component_set_icalcomponent (new_comp, new_icalcomp)) {
 			g_clear_object (&new_icalcomp);
 			g_clear_object (&new_comp);
@@ -419,7 +419,7 @@ ensure_mandatory_properties (ECalComponent *comp)
 	} else {
 		ICalTime *tt;
 
-		tt = i_cal_time_current_time_with_zone (i_cal_timezone_get_utc_timezone ());
+		tt = i_cal_time_new_current_with_zone (i_cal_timezone_get_utc_timezone ());
 
 		prop = i_cal_property_new_dtstamp (tt);
 		i_cal_component_take_property (comp->priv->icalcomp, prop);
@@ -663,7 +663,7 @@ e_cal_component_get_as_string (ECalComponent *comp)
 	/* Ensure that the user has committed the new SEQUENCE */
 	g_return_val_if_fail (comp->priv->need_sequence_inc == FALSE, NULL);
 
-	return i_cal_component_as_ical_string_r (comp->priv->icalcomp);
+	return i_cal_component_as_ical_string (comp->priv->icalcomp);
 }
 
 /* Ensures that an alarm subcomponent has the mandatory properties it needs. */
@@ -1476,7 +1476,7 @@ e_cal_component_set_completed (ECalComponent *comp,
 	g_return_if_fail (comp->priv->icalcomp != NULL);
 
 	if (tt && i_cal_time_is_date ((ICalTime *) tt)) {
-		tmp_tt = i_cal_time_new_clone (tt);
+		tmp_tt = i_cal_time_clone (tt);
 		tt = tmp_tt;
 
 		i_cal_time_set_is_date (tmp_tt, FALSE);
@@ -2098,7 +2098,7 @@ set_period_list (ICalComponent *icalcomp,
 		if (!period)
 			continue;
 
-		ic_period = i_cal_period_null_period ();
+		ic_period = i_cal_period_new_null_period ();
 		ic_datetimeperiod = i_cal_datetimeperiod_new ();
 
 		i_cal_period_set_start (ic_period, e_cal_component_period_get_start (period));
diff --git a/src/calendar/libecal/e-cal-recur.c b/src/calendar/libecal/e-cal-recur.c
index 025067d9a..0f4251c32 100644
--- a/src/calendar/libecal/e-cal-recur.c
+++ b/src/calendar/libecal/e-cal-recur.c
@@ -108,7 +108,7 @@ e_instance_time_new (const ICalTime *tt,
 
 	it = g_new0 (EInstanceTime, 1);
 
-	it->tt = i_cal_time_new_clone (tt);
+	it->tt = i_cal_time_clone (tt);
 	it->duration_set = duration && !i_cal_duration_is_null_duration (duration);
 
 	if (it->duration_set) {
@@ -324,8 +324,8 @@ intersects_interval (const ICalTime *tt,
 	if (!tt || !interval_start || !interval_end)
 		return FALSE;
 
-	ttstart = i_cal_time_new_clone (tt);
-	ttend = i_cal_time_new_clone (ttstart);
+	ttstart = i_cal_time_clone (tt);
+	ttend = i_cal_time_clone (ttstart);
 
 	if (duration && !i_cal_duration_is_null_duration ((ICalDuration *) duration)) {
 		apply_duration (ttend, (ICalDuration *) duration);
@@ -427,7 +427,7 @@ e_cal_recur_generate_instances_sync (ICalComponent *icalcomp,
 			comp_duration = i_cal_component_get_duration (icalcomp);
 
 			if (comp_duration && !i_cal_duration_is_null_duration (comp_duration)) {
-				dtend = i_cal_time_new_clone (dtstart);
+				dtend = i_cal_time_clone (dtstart);
 
 				apply_duration (dtend, comp_duration);
 			}
@@ -440,7 +440,7 @@ e_cal_recur_generate_instances_sync (ICalComponent *icalcomp,
 		 * If DTSTART is a DATE value we add 1 day. */
 		if (!dtend || i_cal_time_is_null_time (dtend)) {
 			g_clear_object (&dtend);
-			dtend = i_cal_time_new_clone (dtstart);
+			dtend = i_cal_time_clone (dtstart);
 
 			if (i_cal_time_is_date (dtend))
 				i_cal_time_adjust (dtend, 1, 0, 0, 0);
@@ -530,7 +530,7 @@ e_cal_recur_generate_instances_sync (ICalComponent *icalcomp,
 						break;
 
 					g_clear_object (&prev);
-					prev = i_cal_time_new_clone (next);
+					prev = i_cal_time_clone (next);
 
 					if (intersects_interval (next, NULL, duration_days, duration_seconds, interval_start, interval_end)) {
 						g_hash_table_insert (times, e_instance_time_new (next, NULL), NULL);
@@ -552,7 +552,7 @@ e_cal_recur_generate_instances_sync (ICalComponent *icalcomp,
 		     g_object_unref (prop), prop = i_cal_component_get_next_property (icalcomp, I_CAL_RDATE_PROPERTY)) {
 			ICalDatetimeperiod *rdate = i_cal_property_get_rdate (prop);
 			ICalTime *tt = NULL;
-			ICalDuration *duration = i_cal_duration_null_duration ();
+			ICalDuration *duration = i_cal_duration_new_null_duration ();
 
 			tt = i_cal_datetimeperiod_get_time (rdate);
 			if (!tt || i_cal_time_is_null_time (tt)) {
@@ -676,7 +676,7 @@ e_cal_recur_generate_instances_sync (ICalComponent *icalcomp,
 					    i_cal_time_compare (next, prev) == 0)
 						break;
 					g_clear_object (&prev);
-					prev = i_cal_time_new_clone (next);
+					prev = i_cal_time_clone (next);
 
 					if (intersects_interval (next, NULL, duration_days, duration_seconds, interval_start, interval_end)) {
 						EInstanceTime it;
@@ -762,7 +762,7 @@ e_cal_recur_generate_instances_sync (ICalComponent *icalcomp,
 			if (!it)
 				continue;
 
-			endtt = i_cal_time_new_clone (it->tt);
+			endtt = i_cal_time_clone (it->tt);
 
 			if (it->duration_set) {
 				dur_days = it->duration_days;
@@ -1381,8 +1381,8 @@ call_instance_callback (ECalRecurInstanceCb cb,
 	g_return_val_if_fail (cb != NULL, FALSE);
 
 	utc_zone = i_cal_timezone_get_utc_timezone ();
-	start = i_cal_time_from_timet_with_zone (dtstart_time, FALSE, utc_zone);
-	end = i_cal_time_from_timet_with_zone (dtend_time, FALSE, utc_zone);
+	start = i_cal_time_new_from_timet_with_zone (dtstart_time, FALSE, utc_zone);
+	end = i_cal_time_new_from_timet_with_zone (dtend_time, FALSE, utc_zone);
 
 	res = cb (e_cal_component_get_icalcomponent (comp), start, end, cb_data, NULL, NULL);
 
@@ -1530,8 +1530,8 @@ e_cal_recur_generate_instances_of_rule (ECalComponent *comp,
 	if (!(e_cal_component_has_recurrences (comp)
 	      || e_cal_component_has_exceptions (comp))) {
 		if (e_cal_component_get_vtype (comp) == E_CAL_COMPONENT_JOURNAL) {
-			ICalTime *start_t = i_cal_time_from_timet_with_zone (start, FALSE, default_timezone);
-			ICalTime *end_t = i_cal_time_from_timet_with_zone (end, FALSE, default_timezone);
+			ICalTime *start_t = i_cal_time_new_from_timet_with_zone (start, FALSE, default_timezone);
+			ICalTime *end_t = i_cal_time_new_from_timet_with_zone (end, FALSE, default_timezone);
 
 			if ((i_cal_time_compare_date_only (dtstarttt, start_t) >= 0) && ((i_cal_time_compare_date_only (dtstarttt, end_t) < 0)))
 				call_instance_callback (cb, comp, dtstart_time, dtend_time, cb_data);
@@ -1783,7 +1783,7 @@ e_cal_recur_from_icalproperty (ICalProperty *prop,
 	if (G_UNLIKELY (i_cal_recurrence_get_interval (ir) < 1)) {
 		gchar *str;
 
-		str = i_cal_recurrence_as_string_r (ir);
+		str = i_cal_recurrence_to_string (ir);
 		g_warning (
 			"Invalid interval in rule %s - using 1\n",
 			str);
@@ -2018,7 +2018,7 @@ generate_instances_for_chunk (ECalComponent *comp,
 		if (!tt)
 			continue;
 
-		tt = i_cal_time_new_clone (tt);
+		tt = i_cal_time_clone (tt);
 		i_cal_time_convert_to_zone_inplace (tt, zone);
 		cotime.year = i_cal_time_get_year (tt);
 		cotime.month = i_cal_time_get_month (tt) - 1;
@@ -2089,7 +2089,7 @@ generate_instances_for_chunk (ECalComponent *comp,
 		if (!tt)
 			continue;
 
-		tt = i_cal_time_new_clone (tt);
+		tt = i_cal_time_clone (tt);
 		i_cal_time_convert_to_zone_inplace (tt, zone);
 
 		cotime.year = i_cal_time_get_year (tt);
@@ -2142,7 +2142,7 @@ generate_instances_for_chunk (ECalComponent *comp,
 			"Checking occurrence: %s\n",
 			cal_obj_time_to_string (occ));
 #endif
-		start_tt = i_cal_time_null_time ();
+		start_tt = i_cal_time_new_null_time ();
 		i_cal_time_set_date (start_tt, occ->year, occ->month + 1, occ->day);
 		i_cal_time_set_time (start_tt, occ->hour, occ->minute, occ->second);
 		start_time = i_cal_time_as_timet_with_zone (start_tt, zone);
@@ -2183,7 +2183,7 @@ generate_instances_for_chunk (ECalComponent *comp,
 			cal_obj_time_add_seconds (occ, duration_seconds);
 		}
 
-		end_tt = i_cal_time_null_time ();
+		end_tt = i_cal_time_new_null_time ();
 		i_cal_time_set_date (end_tt, occ->year, occ->month + 1, occ->day);
 		i_cal_time_set_time (end_tt, occ->hour, occ->minute, occ->second);
 		end_time = i_cal_time_as_timet_with_zone (end_tt, zone);
@@ -4604,7 +4604,7 @@ cal_object_time_from_time (CalObjTime *cotime,
 {
 	ICalTime *tt;
 
-	tt = i_cal_time_from_timet_with_zone (t, FALSE, zone);
+	tt = i_cal_time_new_from_timet_with_zone (t, FALSE, zone);
 
 	cotime->year = i_cal_time_get_year (tt);
 	cotime->month = i_cal_time_get_month (tt) - 1;
@@ -4839,9 +4839,9 @@ e_cal_recur_set_rule_end_date (ICalProperty *prop,
 
 	/* We save the value as a UTC DATE-TIME. */
 	utc_zone = i_cal_timezone_get_utc_timezone ();
-	icaltime = i_cal_time_from_timet_with_zone (end_date, FALSE, utc_zone);
+	icaltime = i_cal_time_new_from_timet_with_zone (end_date, FALSE, utc_zone);
 	value = i_cal_value_new_datetime (icaltime);
-	end_date_string = i_cal_value_as_ical_string_r (value);
+	end_date_string = i_cal_value_as_ical_string (value);
 	g_object_unref (value);
 	g_object_unref (icaltime);
 
@@ -5765,7 +5765,7 @@ e_cal_recur_describe_recurrence (ICalComponent *icalcomp,
 				to_zone = i_cal_time_get_timezone (dtstart);
 
 				if (to_zone)
-					i_cal_timezone_convert_time (until, from_zone, to_zone);
+					i_cal_time_convert_timezone (until, from_zone, to_zone);
 
 				i_cal_time_set_time (until, 0, 0, 0);
 				i_cal_time_set_is_date (until, TRUE);
diff --git a/src/calendar/libecal/e-cal-time-util.c b/src/calendar/libecal/e-cal-time-util.c
index f89dbaf6e..e53e6f69a 100644
--- a/src/calendar/libecal/e-cal-time-util.c
+++ b/src/calendar/libecal/e-cal-time-util.c
@@ -167,8 +167,8 @@ time_add_day_with_zone (time_t time,
 	ICalTime *tt;
 	time_t res;
 
-	/* Convert to an icaltimetype. */
-	tt = i_cal_time_from_timet_with_zone (time, FALSE, (ICalTimezone *) zone);
+	/* Convert to an ICalTime. */
+	tt = i_cal_time_new_from_timet_with_zone (time, FALSE, (ICalTimezone *) zone);
 
 	/* Add/subtract the number of days. */
 	i_cal_time_adjust (tt, days, 0, 0, 0);
@@ -231,8 +231,8 @@ time_add_month_with_zone (time_t time,
 	gint day, days_in_month;
 	time_t res;
 
-	/* Convert to an icaltimetype. */
-	tt = i_cal_time_from_timet_with_zone (time, FALSE, (ICalTimezone *) zone);
+	/* Convert to an ICalTime. */
+	tt = i_cal_time_new_from_timet_with_zone (time, FALSE, (ICalTimezone *) zone);
 
 	/* Add on the number of months. */
 	i_cal_time_set_month (tt, i_cal_time_get_month (tt) + months);
@@ -280,8 +280,8 @@ time_year_begin_with_zone (time_t time,
 	ICalTime *tt;
 	time_t res;
 
-	/* Convert to an icaltimetype. */
-	tt = i_cal_time_from_timet_with_zone (time, FALSE, (ICalTimezone *) zone);
+	/* Convert to an ICalTime. */
+	tt = i_cal_time_new_from_timet_with_zone (time, FALSE, (ICalTimezone *) zone);
 
 	/* Set it to the start of the year. */
 	i_cal_time_set_month (tt, 1);
@@ -318,8 +318,8 @@ time_month_begin_with_zone (time_t time,
 	ICalTime *tt;
 	time_t res;
 
-	/* Convert to an icaltimetype. */
-	tt = i_cal_time_from_timet_with_zone (time, FALSE, (ICalTimezone *) zone);
+	/* Convert to an ICalTime. */
+	tt = i_cal_time_new_from_timet_with_zone (time, FALSE, (ICalTimezone *) zone);
 
 	/* Set it to the start of the month. */
 	i_cal_time_set_day (tt, 1);
@@ -359,8 +359,8 @@ time_week_begin_with_zone (time_t time,
 	gint weekday, offset;
 	time_t res;
 
-	/* Convert to an icaltimetype. */
-	tt = i_cal_time_from_timet_with_zone (time, FALSE, (ICalTimezone *) zone);
+	/* Convert to an ICalTime. */
+	tt = i_cal_time_new_from_timet_with_zone (time, FALSE, (ICalTimezone *) zone);
 
 	/* Get the weekday. */
 	weekday = time_day_of_week (i_cal_time_get_day (tt), i_cal_time_get_month (tt) - 1, i_cal_time_get_year (tt));
@@ -405,8 +405,8 @@ time_day_begin_with_zone (time_t time,
 	ICalTime *tt;
 	time_t new_time;
 
-	/* Convert to an icaltimetype. */
-	tt = i_cal_time_from_timet_with_zone (time, FALSE, (ICalTimezone *) zone);
+	/* Convert to an ICalTime. */
+	tt = i_cal_time_new_from_timet_with_zone (time, FALSE, (ICalTimezone *) zone);
 
 	/* Set it to the start of the day. */
 	i_cal_time_set_hour (tt, 0);
@@ -443,8 +443,8 @@ time_day_end_with_zone (time_t time,
 	ICalTime *tt;
 	time_t new_time;
 
-	/* Convert to an icaltimetype. */
-	tt = i_cal_time_from_timet_with_zone (time, FALSE, (ICalTimezone *) zone);
+	/* Convert to an ICalTime. */
+	tt = i_cal_time_new_from_timet_with_zone (time, FALSE, (ICalTimezone *) zone);
 
 	/* Set it to the start of the next day. */
 	i_cal_time_set_hour (tt, 0);
@@ -483,7 +483,7 @@ time_to_gdate_with_zone (GDate *date,
 	g_return_if_fail (date != NULL);
 	g_return_if_fail (time != -1);
 
-	tt = i_cal_time_from_timet_with_zone (
+	tt = i_cal_time_new_from_timet_with_zone (
 		time, FALSE,
 		zone ? (ICalTimezone *) zone : i_cal_timezone_get_utc_timezone ());
 
@@ -682,7 +682,7 @@ time_from_isodate (const gchar *str)
 
 #define digit_at(x,y) (x[y] - '0')
 
-	tt = i_cal_time_null_time ();
+	tt = i_cal_time_new_null_time ();
 
 	i_cal_time_set_year (tt, digit_at (str, 0) * 1000 +
 				     digit_at (str, 1) * 100 +
@@ -776,9 +776,9 @@ e_cal_util_icaltime_to_tm_with_zone (const ICalTime *itt,
 
 	g_return_val_if_fail (itt != NULL, tm);
 
-	itt_copy = i_cal_time_new_clone (itt);
+	itt_copy = i_cal_time_clone (itt);
 
-	i_cal_timezone_convert_time (itt_copy, (ICalTimezone *) from_zone, (ICalTimezone *) to_zone);
+	i_cal_time_convert_timezone (itt_copy, (ICalTimezone *) from_zone, (ICalTimezone *) to_zone);
 	tm = e_cal_util_icaltime_to_tm (itt_copy);
 	g_object_unref (itt_copy);
 
@@ -805,7 +805,7 @@ e_cal_util_tm_to_icaltime (struct tm *tm,
 
 	g_return_val_if_fail (tm != NULL, NULL);
 
-	itt = i_cal_time_null_time ();
+	itt = i_cal_time_new_null_time ();
 
 	if (!is_date)
 		i_cal_time_set_time (itt, tm->tm_hour, tm->tm_min, tm->tm_sec);
diff --git a/src/calendar/libecal/e-cal-util.c b/src/calendar/libecal/e-cal-util.c
index f9e81523c..77c691376 100644
--- a/src/calendar/libecal/e-cal-util.c
+++ b/src/calendar/libecal/e-cal-util.c
@@ -89,7 +89,7 @@ e_cal_util_new_component (ICalComponentKind kind)
 	uid = e_util_generate_uid ();
 	i_cal_component_set_uid (icalcomp, uid);
 	g_free (uid);
-	dtstamp = i_cal_time_current_time_with_zone (i_cal_timezone_get_utc_timezone ());
+	dtstamp = i_cal_time_new_current_with_zone (i_cal_timezone_get_utc_timezone ());
 	i_cal_component_set_dtstamp (icalcomp, dtstamp);
 	g_object_unref (dtstamp);
 
@@ -124,7 +124,7 @@ e_cal_util_copy_timezone (const ICalTimezone *zone)
 	if (comp) {
 		ICalComponent *comp_copy;
 
-		comp_copy = i_cal_component_new_clone (comp);
+		comp_copy = i_cal_component_clone (comp);
 		if (!i_cal_timezone_set_component (zone_copy, comp_copy))
 			g_clear_object (&zone_copy);
 		g_object_unref (comp_copy);
@@ -287,9 +287,8 @@ e_cal_util_parse_ics_file (const gchar *filename)
 	fl.bof = TRUE;
 
 	parser = i_cal_parser_new ();
-	i_cal_parser_set_gen_data (parser, &fl);
 
-	icalcomp = i_cal_parser_parse (parser, get_line_fn);
+	icalcomp = i_cal_parser_parse (parser, get_line_fn, &fl);
 	g_object_unref (parser);
 	fclose (fl.file);
 
@@ -696,8 +695,8 @@ e_cal_util_generate_alarms_for_comp (ECalComponent *comp,
 	aod.triggers = NULL;
 	aod.n_triggers = 0;
 
-	alarm_start_tt = i_cal_time_from_timet_with_zone (alarm_start, FALSE, i_cal_timezone_get_utc_timezone ());
-	alarm_end_tt = i_cal_time_from_timet_with_zone (alarm_end, FALSE, i_cal_timezone_get_utc_timezone ());
+	alarm_start_tt = i_cal_time_new_from_timet_with_zone (alarm_start, FALSE, i_cal_timezone_get_utc_timezone ());
+	alarm_end_tt = i_cal_time_new_from_timet_with_zone (alarm_end, FALSE, i_cal_timezone_get_utc_timezone ());
 
 	e_cal_recur_generate_instances_sync (e_cal_component_get_icalcomponent (comp),
 		alarm_start_tt, alarm_end_tt,
@@ -943,7 +942,7 @@ add_timezone_cb (ICalParameter *param,
 
 	vtz_comp = i_cal_timezone_get_component (tz);
 	if (vtz_comp) {
-		i_cal_component_take_component (f_data->vcal_comp, i_cal_component_new_clone (vtz_comp));
+		i_cal_component_take_component (f_data->vcal_comp, i_cal_component_clone (vtz_comp));
 		g_object_unref (vtz_comp);
 	}
 
@@ -1133,7 +1132,7 @@ e_cal_util_component_get_recurid_as_string (ICalComponent *icalcomp)
 	    i_cal_time_is_null_time (recurid)) {
 		rid = g_strdup ("0");
 	} else {
-		rid = i_cal_time_as_ical_string_r (recurid);
+		rid = i_cal_time_as_ical_string (recurid);
 	}
 
 	g_clear_object (&recurid);
@@ -1237,7 +1236,7 @@ e_cal_util_construct_instance (ICalComponent *icalcomp,
 
 	/* Make sure the specified instance really exists */
 	start = i_cal_time_convert_to_zone ((ICalTime *) rid, i_cal_timezone_get_utc_timezone ());
-	end = i_cal_time_new_clone (start);
+	end = i_cal_time_clone (start);
 	i_cal_time_adjust (end, 0, 0, 0, 1);
 
 	instance.start = i_cal_time_as_timet (start);
@@ -1251,7 +1250,7 @@ e_cal_util_construct_instance (ICalComponent *icalcomp,
 		return NULL;
 
 	/* Make the instance */
-	icalcomp = i_cal_component_new_clone (icalcomp);
+	icalcomp = i_cal_component_clone (icalcomp);
 	i_cal_component_set_recurrenceid (icalcomp, (ICalTime *) rid);
 
 	return icalcomp;
@@ -1408,7 +1407,7 @@ e_cal_util_remove_instances_ex (ICalComponent *icalcomp,
 						ttuntil = i_cal_time_add ((ICalTime *) rid, dur);
 						g_clear_object (&dur);
 					} else {
-						ttuntil = i_cal_time_new_clone (rid);
+						ttuntil = i_cal_time_clone (rid);
 					}
 					i_cal_time_adjust (ttuntil, 0, 0, 0, -1);
 					i_cal_recurrence_set_until (rule, ttuntil);
@@ -1537,7 +1536,7 @@ e_cal_util_split_at_instance (ICalComponent *icalcomp,
 
 	/* Make sure the specified instance really exists */
 	start = i_cal_time_convert_to_zone ((ICalTime *) rid, i_cal_timezone_get_utc_timezone ());
-	end = i_cal_time_new_clone (start);
+	end = i_cal_time_clone (start);
 	i_cal_time_adjust (end, 0, 0, 0, 1);
 
 	instance.start = i_cal_time_as_timet (start);
@@ -1547,11 +1546,11 @@ e_cal_util_split_at_instance (ICalComponent *icalcomp,
 	g_clear_object (&end);
 
 	/* Make the copy */
-	icalcomp = i_cal_component_new_clone (icalcomp);
+	icalcomp = i_cal_component_clone (icalcomp);
 
 	e_cal_util_remove_instances_ex (icalcomp, rid, E_CAL_OBJ_MOD_THIS_AND_PRIOR, TRUE, FALSE);
 
-	start = i_cal_time_new_clone ((ICalTime *) rid);
+	start = i_cal_time_clone ((ICalTime *) rid);
 
 	if (!master_dtstart || i_cal_time_is_null_time ((ICalTime *) master_dtstart)) {
 		dtstart = i_cal_component_get_dtstart (icalcomp);
@@ -1572,7 +1571,7 @@ e_cal_util_split_at_instance (ICalComponent *icalcomp,
 		if (i_cal_time_is_null_time (dtend)) {
 			i_cal_component_set_duration (icalcomp, duration);
 		} else {
-			end = i_cal_time_new_clone (start);
+			end = i_cal_time_clone (start);
 			if (i_cal_duration_is_neg (duration))
 				i_cal_time_adjust (end, -i_cal_duration_get_days (duration)
 							- 7 * i_cal_duration_get_weeks (duration),
@@ -1681,7 +1680,7 @@ check_first_instance_cb (ICalComponent *icalcomp,
 		dtstart = i_cal_component_get_dtstart (icalcomp);
 		zone = i_cal_time_get_timezone (dtstart);
 
-		rid = i_cal_time_from_timet_with_zone (i_cal_time_as_timet (instance_start), i_cal_time_is_date (dtstart), zone);
+		rid = i_cal_time_new_from_timet_with_zone (i_cal_time_as_timet (instance_start), i_cal_time_is_date (dtstart), zone);
 
 		g_clear_object (&dtstart);
 	}
@@ -2090,7 +2089,7 @@ e_cal_util_component_dup_x_property (ICalComponent *icalcomp,
 	if (!prop)
 		return NULL;
 
-	x_value = i_cal_property_get_value_as_string_r (prop);
+	x_value = i_cal_property_get_value_as_string (prop);
 
 	g_object_unref (prop);
 
@@ -2264,7 +2263,7 @@ e_cal_util_find_next_occurrence (ICalComponent *vtodo,
 	interval_start = i_cal_component_get_dtstart (vtodo);
 	if (!interval_start || i_cal_time_is_null_time (interval_start) || !i_cal_time_is_valid_time (interval_start)) {
 		g_clear_object (&interval_start);
-		interval_start = i_cal_time_current_time_with_zone (e_cal_client_get_default_timezone (cal_client));
+		interval_start = i_cal_time_new_current_with_zone (e_cal_client_get_default_timezone (cal_client));
 	}
 
 	prop = i_cal_component_get_first_property (vtodo, I_CAL_RRULE_PROPERTY);
@@ -2289,13 +2288,13 @@ e_cal_util_find_next_occurrence (ICalComponent *vtodo,
 	nod.next = NULL;
 
 	do {
-		interval_end = i_cal_time_new_clone (interval_start);
+		interval_end = i_cal_time_clone (interval_start);
 		i_cal_time_adjust (interval_end, advance_days, 0, 0, 0);
 
 		g_clear_object (&(nod.next));
 
 		nod.interval_start = interval_start;
-		nod.next = i_cal_time_null_time ();
+		nod.next = i_cal_time_new_null_time ();
 		nod.found_next = FALSE;
 		nod.any_hit = FALSE;
 
@@ -2382,7 +2381,7 @@ e_cal_util_init_recur_task_sync (ICalComponent *vtodo,
 	if (!dtstart || i_cal_time_is_null_time (dtstart) || !i_cal_time_is_valid_time (dtstart)) {
 		g_clear_object (&dtstart);
 
-		dtstart = i_cal_time_current_time_with_zone (e_cal_client_get_default_timezone (cal_client));
+		dtstart = i_cal_time_new_current_with_zone (e_cal_client_get_default_timezone (cal_client));
 		i_cal_component_set_dtstart (vtodo, dtstart);
 	}
 
@@ -2508,7 +2507,7 @@ e_cal_util_mark_task_complete_sync (ICalComponent *vtodo,
 				/* ... eventually fallback to the new DTSTART for the new DUE */
 				if (!new_due || i_cal_time_is_null_time (new_due) || !i_cal_time_is_valid_time (new_due)) {
 					g_clear_object (&new_due);
-					new_due = i_cal_time_new_clone (new_dtstart);
+					new_due = i_cal_time_clone (new_dtstart);
 				}
 
 				g_clear_object (&old_due);
@@ -2571,8 +2570,8 @@ e_cal_util_mark_task_complete_sync (ICalComponent *vtodo,
 		ICalTime *tt;
 
 		tt = completed_time != (time_t) -1 ?
-			i_cal_time_from_timet_with_zone (completed_time, FALSE, i_cal_timezone_get_utc_timezone ()) :
-			i_cal_time_current_time_with_zone (i_cal_timezone_get_utc_timezone ());
+			i_cal_time_new_from_timet_with_zone (completed_time, FALSE, i_cal_timezone_get_utc_timezone ()) :
+			i_cal_time_new_current_with_zone (i_cal_timezone_get_utc_timezone ());
 		prop = i_cal_property_new_completed (tt);
 		i_cal_component_take_property (vtodo, prop);
 		g_object_unref (tt);
diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c
index 889d80eac..40d3fa1c7 100644
--- a/src/calendar/libecal/e-reminder-watcher.c
+++ b/src/calendar/libecal/e-reminder-watcher.c
@@ -161,7 +161,7 @@ e_reminder_watcher_timet_as_string (gint64 tt)
 			break;
 	}
 
-	itt = i_cal_time_from_timet_with_zone ((time_t) tt, 0, i_cal_timezone_get_utc_timezone ());
+	itt = i_cal_time_new_from_timet_with_zone ((time_t) tt, 0, i_cal_timezone_get_utc_timezone ());
 
 	g_snprintf (buffers[index], 32, "%04d%02d%02dT%02d%02d%02d",
 		i_cal_time_get_year (itt), i_cal_time_get_month (itt), i_cal_time_get_day (itt),
@@ -959,7 +959,7 @@ e_reminder_watcher_objects_changed (EReminderWatcher *watcher,
 
 			itt = i_cal_component_get_recurrenceid (icalcomp);
 			if (i_cal_time_is_valid_time (itt) && !i_cal_time_is_null_time (itt))
-				rid = i_cal_time_as_ical_string_r (itt);
+				rid = i_cal_time_as_ical_string (itt);
 			else
 				rid = g_strdup ("0");
 
@@ -2644,7 +2644,7 @@ e_reminder_watcher_describe_data (EReminderWatcher *watcher,
 				is_date = i_cal_time_is_date (itt);
 			g_clear_object (&itt);
 
-			itt = i_cal_time_from_timet_with_zone (e_cal_component_alarm_instance_get_occur_start (rd->instance), is_date, zone);
+			itt = i_cal_time_new_from_timet_with_zone (e_cal_component_alarm_instance_get_occur_start (rd->instance), is_date, zone);
 
 			g_signal_emit (watcher, signals[FORMAT_TIME], 0, rd, itt, &timestrptr, 254, NULL);
 
diff --git a/src/calendar/libedata-cal/e-cal-backend-sexp.c b/src/calendar/libedata-cal/e-cal-backend-sexp.c
index 680606143..4468e3d69 100644
--- a/src/calendar/libedata-cal/e-cal-backend-sexp.c
+++ b/src/calendar/libedata-cal/e-cal-backend-sexp.c
@@ -210,8 +210,8 @@ func_occur_in_time_range (ESExp *esexp,
 	/* See if the object occurs in the specified time range */
 	ctx->occurs = FALSE;
 
-	starttt = i_cal_time_from_timet_with_zone (start, FALSE, utc_zone);
-	endtt = i_cal_time_from_timet_with_zone (end, FALSE, utc_zone);
+	starttt = i_cal_time_new_from_timet_with_zone (start, FALSE, utc_zone);
+	endtt = i_cal_time_new_from_timet_with_zone (end, FALSE, utc_zone);
 
 	e_cal_recur_generate_instances_sync (
 		e_cal_component_get_icalcomponent (ctx->comp), starttt, endtt,
@@ -300,8 +300,8 @@ func_occurrences_count (ESExp *esexp,
 
 	default_zone = i_cal_timezone_get_utc_timezone ();
 
-	starttt = i_cal_time_from_timet_with_zone (start, FALSE, default_zone);
-	endtt = i_cal_time_from_timet_with_zone (end, FALSE, default_zone);
+	starttt = i_cal_time_new_from_timet_with_zone (start, FALSE, default_zone);
+	endtt = i_cal_time_new_from_timet_with_zone (end, FALSE, default_zone);
 
 	ctx->occurrences_count = 0;
 	e_cal_recur_generate_instances_sync (
diff --git a/src/calendar/libedata-cal/e-cal-backend-sync.c b/src/calendar/libedata-cal/e-cal-backend-sync.c
index 8901e8344..d35e24b33 100644
--- a/src/calendar/libedata-cal/e-cal-backend-sync.c
+++ b/src/calendar/libedata-cal/e-cal-backend-sync.c
@@ -601,7 +601,7 @@ e_cal_backend_sync_get_timezone (ECalBackendSync *backend,
 				if (error && !*error)
 					g_propagate_error (error, e_cal_client_error_create (E_CAL_CLIENT_ERROR_INVALID_OBJECT, NULL));
 			} else {
-				*tzobject = i_cal_component_as_ical_string_r (icomp);
+				*tzobject = i_cal_component_as_ical_string (icomp);
 
 				g_object_unref (icomp);
 			}
@@ -912,7 +912,7 @@ cal_backend_get_timezone (ECalBackend *backend,
 				icomp = i_cal_timezone_get_component (zone);
 
 			if (icomp) {
-				ICalComponent *clone = i_cal_component_new_clone (icomp);
+				ICalComponent *clone = i_cal_component_clone (icomp);
 				ICalProperty *prop;
 
 				prop = i_cal_component_get_first_property (clone, I_CAL_TZID_PROPERTY);
@@ -920,7 +920,7 @@ cal_backend_get_timezone (ECalBackend *backend,
 					/* change tzid to our, because the component has the buildin tzid */
 					i_cal_property_set_tzid (prop, tzid);
 
-					object = i_cal_component_as_ical_string_r (clone);
+					object = i_cal_component_as_ical_string (clone);
 
 					g_clear_error (&error);
 					g_object_unref (prop);
diff --git a/src/calendar/libedata-cal/e-cal-backend-util.c b/src/calendar/libedata-cal/e-cal-backend-util.c
index 078835461..e0a1e8442 100644
--- a/src/calendar/libedata-cal/e-cal-backend-util.c
+++ b/src/calendar/libedata-cal/e-cal-backend-util.c
@@ -210,7 +210,7 @@ e_cal_backend_user_declined (ESourceRegistry *registry,
 			gchar *attendee;
 			gchar *address;
 
-			attendee = i_cal_property_get_value_as_string_r (prop);
+			attendee = i_cal_property_get_value_as_string (prop);
 			if (attendee) {
 				if (!g_ascii_strncasecmp (attendee, "mailto:", 7))
 					address = g_strdup (attendee + 7);
diff --git a/src/calendar/libedata-cal/e-cal-backend.c b/src/calendar/libedata-cal/e-cal-backend.c
index bbdd7a053..9bd18dad2 100644
--- a/src/calendar/libedata-cal/e-cal-backend.c
+++ b/src/calendar/libedata-cal/e-cal-backend.c
@@ -887,7 +887,7 @@ cal_backend_get_cached_timezone (ETimezoneCache *cache,
 	 * lead to broken VCALENDARs in the caller. */
 
 	icomp = i_cal_timezone_get_component (builtin_zone);
-	clone = i_cal_component_new_clone (icomp);
+	clone = i_cal_component_clone (icomp);
 	g_object_unref (icomp);
 	icomp = clone;
 
diff --git a/src/calendar/libedata-cal/e-cal-cache.c b/src/calendar/libedata-cal/e-cal-cache.c
index 1ad04a00e..3c9580b30 100644
--- a/src/calendar/libedata-cal/e-cal-cache.c
+++ b/src/calendar/libedata-cal/e-cal-cache.c
@@ -584,7 +584,7 @@ ecc_encode_time_to_sql (ECalCache *cal_cache,
 	    e_cal_component_datetime_get_tzid (dt))
 		zone = ecc_resolve_tzid_cb (e_cal_component_datetime_get_tzid (dt), cal_cache, NULL, NULL);
 
-	i_cal_timezone_convert_time (itt, zone, i_cal_timezone_get_utc_timezone ());
+	i_cal_time_convert_timezone (itt, zone, i_cal_timezone_get_utc_timezone ());
 
 	return ecc_encode_itt_to_sql (itt);
 }
@@ -599,7 +599,7 @@ ecc_encode_timet_to_sql (ECalCache *cal_cache,
 	if (tt <= 0)
 		return NULL;
 
-	itt = i_cal_time_from_timet_with_zone (tt, FALSE, i_cal_timezone_get_utc_timezone ());
+	itt = i_cal_time_new_from_timet_with_zone (tt, FALSE, i_cal_timezone_get_utc_timezone ());
 
 	res = ecc_encode_itt_to_sql (itt);
 
@@ -1149,8 +1149,8 @@ ecc_sexp_func_occur_in_time_range (ESExp *esexp,
 		gchar *start_str, *end_str;
 
 		/* The default zone argument, if any, is ignored here */
-		itt_start = i_cal_time_from_timet_with_zone (argv[0]->value.time, 0, NULL);
-		itt_end = i_cal_time_from_timet_with_zone (argv[1]->value.time, 0, NULL);
+		itt_start = i_cal_time_new_from_timet_with_zone (argv[0]->value.time, 0, NULL);
+		itt_end = i_cal_time_new_from_timet_with_zone (argv[1]->value.time, 0, NULL);
 
 		start_str = ecc_encode_itt_to_sql (itt_start);
 		end_str = ecc_encode_itt_to_sql (itt_end);
@@ -3245,8 +3245,8 @@ e_cal_cache_get_components_in_range_as_strings (ECalCache *cal_cache,
 
 	*out_icalstrings = NULL;
 
-	itt_start = i_cal_time_from_timet_with_zone (range_start, FALSE, NULL);
-	itt_end = i_cal_time_from_timet_with_zone (range_end, FALSE, NULL);
+	itt_start = i_cal_time_new_from_timet_with_zone (range_start, FALSE, NULL);
+	itt_end = i_cal_time_new_from_timet_with_zone (range_end, FALSE, NULL);
 
 	sexp = g_strdup_printf ("(occur-in-time-range? (make-time \"%04d%02d%02dT%02d%02d%02dZ\") (make-time \"%04d%02d%02dT%02d%02d%02dZ\"))",
 		i_cal_time_get_year (itt_start),
@@ -3722,7 +3722,7 @@ e_cal_cache_put_timezone (ECalCache *cal_cache,
 		return FALSE;
 	}
 
-	component_str = i_cal_component_as_ical_string_r (component);
+	component_str = i_cal_component_as_ical_string (component);
 	g_clear_object (&component);
 
 	if (!component_str) {
@@ -4402,7 +4402,7 @@ ecc_get_cached_timezone (ETimezoneCache *cache,
 	 * lead to broken VCALENDARs in the caller. */
 
 	icomp = i_cal_timezone_get_component (builtin_zone);
-	clone = i_cal_component_new_clone (icomp);
+	clone = i_cal_component_clone (icomp);
 	g_object_unref (icomp);
 	icomp = clone;
 
diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c
index aa9fe030d..5a03cba47 100644
--- a/src/calendar/libedata-cal/e-cal-meta-backend.c
+++ b/src/calendar/libedata-cal/e-cal-meta-backend.c
@@ -1034,7 +1034,7 @@ ecmb_gather_timezones (ECalMetaBackend *meta_backend,
 	     g_object_unref (subcomp), subcomp = i_cal_component_get_next_component (icomp, I_CAL_VTIMEZONE_COMPONENT)) {
 		ICalComponent *clone;
 
-		clone = i_cal_component_new_clone (subcomp);
+		clone = i_cal_component_clone (subcomp);
 
 		if (i_cal_timezone_set_component (zone, clone)) {
 			if (i_cal_timezone_get_tzid (zone))
@@ -1092,7 +1092,7 @@ ecmb_load_component_wrapper_sync (ECalMetaBackend *meta_backend,
 		for (subcomp = i_cal_component_get_first_component (icomp, kind);
 		     subcomp;
 		     g_object_unref (subcomp), subcomp = i_cal_component_get_next_component (icomp, kind)) {
-			ECalComponent *comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (subcomp));
+			ECalComponent *comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (subcomp));
 
 			if (comp) {
 				new_instances = g_slist_prepend (new_instances, comp);
@@ -1341,7 +1341,7 @@ ecmb_get_object_sync (ECalBackendSync *sync_backend,
 
 			icomp = e_cal_meta_backend_merge_instances (meta_backend, components, FALSE);
 			if (icomp) {
-				*calobj = i_cal_component_as_ical_string_r (icomp);
+				*calobj = i_cal_component_as_ical_string (icomp);
 
 				g_object_unref (icomp);
 			} else {
@@ -1408,7 +1408,7 @@ ecmb_add_free_busy_instance_cb (ICalComponent *icomp,
 	ICalParameter *param;
 	ICalPeriod *ipt;
 
-	ipt = i_cal_period_null_period ();
+	ipt = i_cal_period_new_null_period ();
 	i_cal_period_set_start (ipt, instance_start);
 	i_cal_period_set_end (ipt, instance_end);
 
@@ -1515,11 +1515,11 @@ ecmb_get_free_busy_sync (ECalBackendSync *sync_backend,
 
 	utc_zone = i_cal_timezone_get_utc_timezone ();
 
-	itt = i_cal_time_from_timet_with_zone (start, FALSE, utc_zone);
+	itt = i_cal_time_new_from_timet_with_zone (start, FALSE, utc_zone);
 	i_cal_component_set_dtstart (vfreebusy, itt);
 	g_object_unref (itt);
 
-	itt = i_cal_time_from_timet_with_zone (end, FALSE, utc_zone);
+	itt = i_cal_time_new_from_timet_with_zone (end, FALSE, utc_zone);
 	i_cal_component_set_dtend (vfreebusy, itt);
 	g_object_unref (itt);
 
@@ -1549,8 +1549,8 @@ ecmb_get_free_busy_sync (ECalBackendSync *sync_backend,
 				continue;
 		}
 
-		starttt = i_cal_time_from_timet_with_zone (start, FALSE, NULL);
-		endtt = i_cal_time_from_timet_with_zone (end, FALSE, NULL);
+		starttt = i_cal_time_new_from_timet_with_zone (start, FALSE, NULL);
+		endtt = i_cal_time_new_from_timet_with_zone (end, FALSE, NULL);
 
 		success = e_cal_recur_generate_instances_sync (icomp, starttt, endtt,
 			ecmb_add_free_busy_instance_cb, vfreebusy,
@@ -1564,7 +1564,7 @@ ecmb_get_free_busy_sync (ECalBackendSync *sync_backend,
 			break;
 	}
 
-	*out_freebusy = g_slist_prepend (*out_freebusy, i_cal_component_as_ical_string_r (vfreebusy));
+	*out_freebusy = g_slist_prepend (*out_freebusy, i_cal_component_as_ical_string (vfreebusy));
 
 	g_slist_free_full (components, g_object_unref);
 	g_object_unref (vfreebusy);
@@ -1620,7 +1620,7 @@ ecmb_create_object_sync (ECalMetaBackend *meta_backend,
 	}
 
 	/* Set the created and last modified times on the component, if not there already */
-	itt = i_cal_time_current_time_with_zone (i_cal_timezone_get_utc_timezone ());
+	itt = i_cal_time_new_current_with_zone (i_cal_timezone_get_utc_timezone ());
 
 	if (!e_cal_util_component_has_property (icomp, I_CAL_CREATED_PROPERTY)) {
 		/* Update both when CREATED is missing, to make sure the LAST-MODIFIED
@@ -1818,7 +1818,7 @@ ecmb_modify_object_sync (ECalMetaBackend *meta_backend,
 	}
 
 	/* Set the last modified time on the component */
-	itt = i_cal_time_current_time_with_zone (i_cal_timezone_get_utc_timezone ());
+	itt = i_cal_time_new_current_with_zone (i_cal_timezone_get_utc_timezone ());
 	e_cal_component_set_last_modified (comp, itt);
 	g_clear_object (&itt);
 
@@ -2145,7 +2145,7 @@ ecmb_remove_object_sync (ECalMetaBackend *meta_backend,
 				success = FALSE;
 				g_propagate_error (error, e_cal_client_error_create (E_CAL_CLIENT_ERROR_OBJECT_NOT_FOUND, NULL));
 			} else {
-				itt = i_cal_time_from_string (rid);
+				itt = i_cal_time_new_from_string (rid);
 				if (itt && !i_cal_time_get_timezone (itt)) {
 					ECalComponentDateTime *dt;
 
@@ -2179,7 +2179,7 @@ ecmb_remove_object_sync (ECalMetaBackend *meta_backend,
 			time_t fromtt, instancett;
 			GSList *link, *previous = instances;
 
-			itt = i_cal_time_from_string (rid);
+			itt = i_cal_time_new_from_string (rid);
 			if (itt && !i_cal_time_get_timezone (itt)) {
 				ECalComponentDateTime *dt;
 
@@ -2325,7 +2325,7 @@ ecmb_remove_object_sync (ECalMetaBackend *meta_backend,
 				e_cal_component_set_sequence (master_comp, sequence + 1);
 
 				/* Set the last modified time on the component */
-				itt = i_cal_time_current_time_with_zone (i_cal_timezone_get_utc_timezone ());
+				itt = i_cal_time_new_current_with_zone (i_cal_timezone_get_utc_timezone ());
 				e_cal_component_set_last_modified (master_comp, itt);
 				g_clear_object (&itt);
 			}
@@ -2565,13 +2565,13 @@ ecmb_receive_objects_sync (ECalBackendSync *sync_backend,
 		for (subcomp = i_cal_component_get_first_component (icomp, kind);
 		     subcomp;
 		     g_object_unref (subcomp), subcomp = i_cal_component_get_next_component (icomp, kind)) {
-			comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (subcomp));
+			comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (subcomp));
 
 			if (comp)
 				comps = g_slist_prepend (comps, comp);
 		}
 	} else if (i_cal_component_isa (icomp) == kind) {
-		comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (icomp));
+		comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (icomp));
 
 		if (comp)
 			comps = g_slist_prepend (comps, comp);
@@ -2776,7 +2776,7 @@ ecmb_get_timezone_sync (ECalBackendSync *sync_backend,
 		if (!icomp) {
 			local_error = e_cal_client_error_create (E_CAL_CLIENT_ERROR_INVALID_OBJECT, NULL);
 		} else {
-			timezone_str = i_cal_component_as_ical_string_r (icomp);
+			timezone_str = i_cal_component_as_ical_string (icomp);
 			g_object_unref (icomp);
 		}
 	}
@@ -3895,7 +3895,7 @@ add_timezone_cb (ICalParameter *param,
 	vtz_comp = i_cal_timezone_get_component (tz);
 
 	if (vtz_comp) {
-		ICalComponent *clone = i_cal_component_new_clone (vtz_comp);
+		ICalComponent *clone = i_cal_component_clone (vtz_comp);
 
 		if (f_data->replace_tzid_with_location) {
 			ICalProperty *prop;
@@ -3965,7 +3965,7 @@ e_cal_meta_backend_merge_instances (ECalMetaBackend *meta_backend,
 			continue;
 		}
 
-		f_data.icomp = i_cal_component_new_clone (e_cal_component_get_icalcomponent (comp));
+		f_data.icomp = i_cal_component_clone (e_cal_component_get_icalcomponent (comp));
 
 		i_cal_component_foreach_tzid (f_data.icomp, add_timezone_cb, &f_data);
 		i_cal_component_take_component (vcalendar, f_data.icomp);
diff --git a/src/calendar/libedata-cal/e-data-cal-view.c b/src/calendar/libedata-cal/e-data-cal-view.c
index 0cb1bcb36..f6f08c94a 100644
--- a/src/calendar/libedata-cal/e-data-cal-view.c
+++ b/src/calendar/libedata-cal/e-data-cal-view.c
@@ -1068,7 +1068,7 @@ filter_component (ICalComponent *icomponent,
 		gchar *name;
 		gboolean is_field_of_interest;
 
-		name = i_cal_property_get_property_name_r (prop);
+		name = i_cal_property_get_property_name (prop);
 
 		if (!name) {
 			g_warning ("NULL iCal property name encountered while serializing component");
@@ -1080,7 +1080,7 @@ filter_component (ICalComponent *icomponent,
 
 		/* Append any name that is mentioned in the fields-of-interest */
 		if (is_field_of_interest) {
-			str = i_cal_property_as_ical_string_r (prop);
+			str = i_cal_property_as_ical_string (prop);
 			g_string_append (string, str);
 			g_free (str);
 		}
diff --git a/tests/libecal/test-cal-client-bulk-methods.c b/tests/libecal/test-cal-client-bulk-methods.c
index da9f7b0dd..6d0fe09dc 100644
--- a/tests/libecal/test-cal-client-bulk-methods.c
+++ b/tests/libecal/test-cal-client-bulk-methods.c
@@ -42,8 +42,8 @@ test_icomps (ICalComponent *icomp1,
 	if (i_cal_time_compare (t1, t2) != 0) {
 		gchar *str1, *str2;
 
-		str1 = i_cal_time_as_ical_string_r (t1);
-		str2 = i_cal_time_as_ical_string_r (t2);
+		str1 = i_cal_time_as_ical_string (t1);
+		str2 = i_cal_time_as_ical_string (t2);
 
 		g_error ("Failure: dtend doesn't match, expected '%s', got '%s'\n", str1, str2);
 
@@ -60,8 +60,8 @@ test_icomps (ICalComponent *icomp1,
 	if (i_cal_time_compare (t1, t2) != 0) {
 		gchar *str1, *str2;
 
-		str1 = i_cal_time_as_ical_string_r (t1);
-		str2 = i_cal_time_as_ical_string_r (t2);
+		str1 = i_cal_time_as_ical_string (t1);
+		str2 = i_cal_time_as_ical_string (t2);
 
 		g_error ("Failure: dtend doesn't match, expected '%s', got '%s'\n", str1, str2);
 
@@ -339,8 +339,8 @@ run_test_bulk_methods_wrapper (ETestServerFixture *fixture,
 
 	cal_client = E_TEST_SERVER_UTILS_SERVICE (fixture, ECalClient);
 
-	dtstart = i_cal_time_current_time_with_zone (i_cal_timezone_get_utc_timezone ());
-	dtend = i_cal_time_new_clone (dtstart);
+	dtstart = i_cal_time_new_current_with_zone (i_cal_timezone_get_utc_timezone ());
+	dtend = i_cal_time_clone (dtstart);
 	i_cal_time_adjust (dtend, 0, 1, 0, 0);
 
 	/* Build up new components */
diff --git a/tests/libecal/test-cal-client-create-object.c b/tests/libecal/test-cal-client-create-object.c
index f76432feb..94cde4d00 100644
--- a/tests/libecal/test-cal-client-create-object.c
+++ b/tests/libecal/test-cal-client-create-object.c
@@ -42,8 +42,8 @@ test_icomps (ICalComponent *icomp1,
 	if (i_cal_time_compare (t1, t2) != 0) {
 		gchar *str1, *str2;
 
-		str1 = i_cal_time_as_ical_string_r (t1);
-		str2 = i_cal_time_as_ical_string_r (t2);
+		str1 = i_cal_time_as_ical_string (t1);
+		str2 = i_cal_time_as_ical_string (t2);
 
 		g_error ("Failure: dtend doesn't match, expected '%s', got '%s'\n", str1, str2);
 
@@ -60,8 +60,8 @@ test_icomps (ICalComponent *icomp1,
 	if (i_cal_time_compare (t1, t2) != 0) {
 		gchar *str1, *str2;
 
-		str1 = i_cal_time_as_ical_string_r (t1);
-		str2 = i_cal_time_as_ical_string_r (t2);
+		str1 = i_cal_time_as_ical_string (t1);
+		str2 = i_cal_time_as_ical_string (t2);
 
 		g_error ("Failure: dtend doesn't match, expected '%s', got '%s'\n", str1, str2);
 
@@ -88,8 +88,8 @@ test_create_object_sync (ETestServerFixture *fixture,
 	cal_client = E_TEST_SERVER_UTILS_SERVICE (fixture, ECalClient);
 
 	/* Build up new component */
-	dtstart = i_cal_time_current_time_with_zone (i_cal_timezone_get_utc_timezone ());
-	dtend = i_cal_time_new_clone (dtstart);
+	dtstart = i_cal_time_new_current_with_zone (i_cal_timezone_get_utc_timezone ());
+	dtend = i_cal_time_clone (dtstart);
 	i_cal_time_adjust (dtend, 0, 1, 0, 0);
 
 	icomp = i_cal_component_new (I_CAL_VEVENT_COMPONENT);
@@ -106,7 +106,7 @@ test_create_object_sync (ETestServerFixture *fixture,
 	if (!e_cal_client_get_object_sync (cal_client, uid, NULL, &icomp2, NULL, &error))
 		g_error ("get object sync: %s", error->message);
 
-	clone = i_cal_component_new_clone (icomp);
+	clone = i_cal_component_clone (icomp);
 	i_cal_component_set_uid (clone, uid);
 
 	test_icomps (clone, icomp2);
@@ -209,7 +209,7 @@ async_write_result_ready (GObject *source_object,
 	if (!e_cal_client_create_object_finish (cal_client, result, &uid, &error))
 		g_error ("create object finish: %s", error->message);
 
-	clone = i_cal_component_new_clone (icomp);
+	clone = i_cal_component_clone (icomp);
 	i_cal_component_set_uid (clone, uid);
 
 	data->clone = clone;
@@ -229,8 +229,8 @@ test_create_object_async (ETestServerFixture *fixture,
 	cal_client = E_TEST_SERVER_UTILS_SERVICE (fixture, ECalClient);
 
 	/* Build up new component */
-	dtstart = i_cal_time_current_time_with_zone (i_cal_timezone_get_utc_timezone ());
-	dtend = i_cal_time_new_clone (dtstart);
+	dtstart = i_cal_time_new_current_with_zone (i_cal_timezone_get_utc_timezone ());
+	dtend = i_cal_time_clone (dtstart);
 	i_cal_time_adjust (dtend, 0, 1, 0, 0);
 
 	icomp = i_cal_component_new (I_CAL_VEVENT_COMPONENT);
diff --git a/tests/libecal/test-cal-client-get-attachment-uris.c b/tests/libecal/test-cal-client-get-attachment-uris.c
index 19e1765e4..fcd7b0460 100644
--- a/tests/libecal/test-cal-client-get-attachment-uris.c
+++ b/tests/libecal/test-cal-client-get-attachment-uris.c
@@ -56,8 +56,8 @@ setup_cal (ECalClient *cal_client)
 	gchar *uid = NULL;
 	GError *error = NULL;
 
-	dtstart = i_cal_time_current_time_with_zone (i_cal_timezone_get_utc_timezone ());
-	dtend = i_cal_time_new_clone (dtstart);
+	dtstart = i_cal_time_new_current_with_zone (i_cal_timezone_get_utc_timezone ());
+	dtend = i_cal_time_clone (dtstart);
 	i_cal_time_adjust (dtend, 0, 1, 0, 0);
 
 	icomp = i_cal_component_new (I_CAL_VEVENT_COMPONENT);
diff --git a/tests/libecal/test-cal-client-get-object-list.c b/tests/libecal/test-cal-client-get-object-list.c
index 6bd62efea..c4e31c409 100644
--- a/tests/libecal/test-cal-client-get-object-list.c
+++ b/tests/libecal/test-cal-client-get-object-list.c
@@ -35,8 +35,8 @@ setup_cal (ECalClient *cal_client)
 	gchar *uid = NULL;
 	GError *error = NULL;
 
-	dtstart = i_cal_time_current_time_with_zone (i_cal_timezone_get_utc_timezone ());
-	dtend = i_cal_time_new_clone (dtstart);
+	dtstart = i_cal_time_new_current_with_zone (i_cal_timezone_get_utc_timezone ());
+	dtend = i_cal_time_clone (dtstart);
 	i_cal_time_adjust (dtend, 0, 1, 0, 0);
 
 	icomp = i_cal_component_new (I_CAL_VEVENT_COMPONENT);
diff --git a/tests/libecal/test-cal-client-get-revision.c b/tests/libecal/test-cal-client-get-revision.c
index 8f3279957..3327bc74f 100644
--- a/tests/libecal/test-cal-client-get-revision.c
+++ b/tests/libecal/test-cal-client-get-revision.c
@@ -34,8 +34,8 @@ get_revision_compare_cycle (ECalClient *client)
 	GError   *error = NULL;
 
 	/* Build up new component */
-	dtstart = i_cal_time_current_time_with_zone (i_cal_timezone_get_utc_timezone ());
-	dtend = i_cal_time_new_clone (dtstart);
+	dtstart = i_cal_time_new_current_with_zone (i_cal_timezone_get_utc_timezone ());
+	dtend = i_cal_time_clone (dtstart);
 	i_cal_time_adjust (dtend, 0, 1, 0, 0);
 
 	icomp = i_cal_component_new (I_CAL_VEVENT_COMPONENT);
diff --git a/tests/libecal/test-cal-client-get-view.c b/tests/libecal/test-cal-client-get-view.c
index 52e13019b..7ce83a101 100644
--- a/tests/libecal/test-cal-client-get-view.c
+++ b/tests/libecal/test-cal-client-get-view.c
@@ -118,8 +118,8 @@ alter_cal_client (gpointer user_data)
 
 	g_return_val_if_fail (cal_client != NULL, NULL);
 
-	dtstart = i_cal_time_current_time_with_zone (i_cal_timezone_get_utc_timezone ());
-	dtend = i_cal_time_new_clone (dtstart);
+	dtstart = i_cal_time_new_current_with_zone (i_cal_timezone_get_utc_timezone ());
+	dtend = i_cal_time_clone (dtstart);
 	i_cal_time_adjust (dtend, 0, 1, 0, 0);
 
 	icomp = i_cal_component_new (I_CAL_VEVENT_COMPONENT);
diff --git a/tests/libecal/test-cal-client-modify-object.c b/tests/libecal/test-cal-client-modify-object.c
index c28c5f119..0e31a90b1 100644
--- a/tests/libecal/test-cal-client-modify-object.c
+++ b/tests/libecal/test-cal-client-modify-object.c
@@ -34,8 +34,8 @@ setup_cal (ECalClient *cal_client)
 	gchar *uid = NULL;
 	GError *error = NULL;
 
-	dtstart = i_cal_time_current_time_with_zone (i_cal_timezone_get_utc_timezone ());
-	dtend = i_cal_time_new_clone (dtstart);
+	dtstart = i_cal_time_new_current_with_zone (i_cal_timezone_get_utc_timezone ());
+	dtend = i_cal_time_clone (dtstart);
 	i_cal_time_adjust (dtend, 0, 1, 0, 0);
 
 	icomp = i_cal_component_new (I_CAL_VEVENT_COMPONENT);
diff --git a/tests/libecal/test-cal-client-receive-objects.c b/tests/libecal/test-cal-client-receive-objects.c
index 44b4192d8..ef743985e 100644
--- a/tests/libecal/test-cal-client-receive-objects.c
+++ b/tests/libecal/test-cal-client-receive-objects.c
@@ -30,8 +30,8 @@ create_object (void)
 	ICalTime *dtstart, *dtend;
 	ICalComponent *icomp;
 
-	dtstart = i_cal_time_current_time_with_zone (i_cal_timezone_get_utc_timezone ());
-	dtend = i_cal_time_new_clone (dtstart);
+	dtstart = i_cal_time_new_current_with_zone (i_cal_timezone_get_utc_timezone ());
+	dtend = i_cal_time_clone (dtstart);
 	i_cal_time_adjust (dtend, 0, 1, 0, 0);
 
 	icomp = i_cal_component_new (I_CAL_VEVENT_COMPONENT);
diff --git a/tests/libecal/test-cal-client-refresh.c b/tests/libecal/test-cal-client-refresh.c
index fd53ec590..dfc47c3e2 100644
--- a/tests/libecal/test-cal-client-refresh.c
+++ b/tests/libecal/test-cal-client-refresh.c
@@ -33,8 +33,8 @@ setup_cal (ECalClient *cal_client)
 	ICalTime *dtstart, *dtend;
 	gchar *uid = NULL;
 
-	dtstart = i_cal_time_current_time_with_zone (i_cal_timezone_get_utc_timezone ());
-	dtend = i_cal_time_new_clone (dtstart);
+	dtstart = i_cal_time_new_current_with_zone (i_cal_timezone_get_utc_timezone ());
+	dtend = i_cal_time_clone (dtstart);
 	i_cal_time_adjust (dtend, 0, 1, 0, 0);
 
 	icomp = i_cal_component_new (I_CAL_VEVENT_COMPONENT);
diff --git a/tests/libecal/test-cal-client-remove-object.c b/tests/libecal/test-cal-client-remove-object.c
index 57ae12fff..274dae6bb 100644
--- a/tests/libecal/test-cal-client-remove-object.c
+++ b/tests/libecal/test-cal-client-remove-object.c
@@ -34,8 +34,8 @@ create_object (ECalClient *cal_client)
 
 	g_return_val_if_fail (cal_client != NULL, NULL);
 
-	dtstart = i_cal_time_current_time_with_zone (i_cal_timezone_get_utc_timezone ());
-	dtend = i_cal_time_new_clone (dtstart);
+	dtstart = i_cal_time_new_current_with_zone (i_cal_timezone_get_utc_timezone ());
+	dtend = i_cal_time_clone (dtstart);
 	i_cal_time_adjust (dtend, 0, 1, 0, 0);
 
 	icomp = i_cal_component_new (I_CAL_VEVENT_COMPONENT);
diff --git a/tests/libecal/test-cal-client-revision-view.c b/tests/libecal/test-cal-client-revision-view.c
index 9eb063124..9da57b141 100644
--- a/tests/libecal/test-cal-client-revision-view.c
+++ b/tests/libecal/test-cal-client-revision-view.c
@@ -58,7 +58,7 @@ get_last_modified (ICalComponent *component)
 	ICalTime *res;
 
 	if (!inner)
-		return i_cal_time_null_time ();
+		return i_cal_time_new_null_time ();
 
 	prop = i_cal_component_get_first_property (inner, I_CAL_LASTMODIFIED_PROPERTY);
 
@@ -66,7 +66,7 @@ get_last_modified (ICalComponent *component)
 		res = i_cal_property_get_lastmodified (prop);
 		g_object_unref (prop);
 	} else {
-		res = i_cal_time_null_time ();
+		res = i_cal_time_new_null_time ();
 	}
 
 	g_clear_object (&inner);
@@ -88,8 +88,8 @@ objects_added_cb (GObject *object,
 		ICalTime *last_modified = get_last_modified (component);
 		gchar *str_recurrence, *str_last_modified;
 
-		str_recurrence = i_cal_time_as_ical_string_r (recurrence);
-		str_last_modified = i_cal_time_as_ical_string_r (last_modified);
+		str_recurrence = i_cal_time_as_ical_string (recurrence);
+		str_last_modified = i_cal_time_as_ical_string (last_modified);
 
 		g_print (
 			"Object added %s (recurrence id:%s, last-modified:%s)\n",
@@ -122,8 +122,8 @@ objects_modified_cb (GObject *object,
 		ICalTime *last_modified = get_last_modified (component);
 		gchar *str_recurrence, *str_last_modified;
 
-		str_recurrence = i_cal_time_as_ical_string_r (recurrence);
-		str_last_modified = i_cal_time_as_ical_string_r (last_modified);
+		str_recurrence = i_cal_time_as_ical_string (recurrence);
+		str_last_modified = i_cal_time_as_ical_string (last_modified);
 
 		g_print (
 			"Object modified %s (recurrence id:%s, last-modified:%s)\n",
@@ -182,8 +182,8 @@ alter_cal_client (gpointer user_data)
 
 	g_return_val_if_fail (cal_client != NULL, NULL);
 
-	now = i_cal_time_current_time_with_zone (i_cal_timezone_get_utc_timezone ());
-	itt = i_cal_time_from_timet_with_zone (i_cal_time_as_timet (now) + 60 * 60 * 60, 0, NULL);
+	now = i_cal_time_new_current_with_zone (i_cal_timezone_get_utc_timezone ());
+	itt = i_cal_time_new_from_timet_with_zone (i_cal_time_as_timet (now) + 60 * 60 * 60, 0, NULL);
 
 	icomp = i_cal_component_new (I_CAL_VEVENT_COMPONENT);
 	i_cal_component_set_summary (icomp, "Initial event summary");
diff --git a/tests/libecal/test-cal-client-send-objects.c b/tests/libecal/test-cal-client-send-objects.c
index 34232e29f..c1b70eaac 100644
--- a/tests/libecal/test-cal-client-send-objects.c
+++ b/tests/libecal/test-cal-client-send-objects.c
@@ -49,7 +49,7 @@ print_icomp (ICalComponent *icomp)
 
 	g_assert_nonnull (icomp);
 
-	ecomp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (icomp));
+	ecomp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (icomp));
 	g_assert_nonnull (ecomp);
 
 	print_ecomp (ecomp);
@@ -63,8 +63,8 @@ create_object (void)
 	ICalComponent *icomp;
 	ICalTime *dtstart, *dtend;
 
-	dtstart = i_cal_time_current_time_with_zone (i_cal_timezone_get_utc_timezone ());
-	dtend = i_cal_time_new_clone (dtstart);
+	dtstart = i_cal_time_new_current_with_zone (i_cal_timezone_get_utc_timezone ());
+	dtend = i_cal_time_clone (dtstart);
 	i_cal_time_adjust (dtend, 0, 1, 0, 0);
 
 	icomp = i_cal_component_new (I_CAL_VEVENT_COMPONENT);
diff --git a/tests/libecal/test-cal-component.c b/tests/libecal/test-cal-component.c
index 6f58f83c5..28b8737fd 100644
--- a/tests/libecal/test-cal-component.c
+++ b/tests/libecal/test-cal-component.c
@@ -141,8 +141,8 @@ verify_struct_parameter_bag_equal (const ECalComponentParameterBag *expected,
 		g_assert_nonnull (param_received);
 		g_assert_cmpint (i_cal_parameter_isa (param_expected), ==, i_cal_parameter_isa (param_received));
 
-		value_expected = i_cal_parameter_as_ical_string_r (param_expected);
-		value_received = i_cal_parameter_as_ical_string_r (param_received);
+		value_expected = i_cal_parameter_as_ical_string (param_expected);
+		value_received = i_cal_parameter_as_ical_string (param_received);
 
 		g_assert_cmpstr (value_expected, ==, value_received);
 
@@ -178,8 +178,8 @@ verify_struct_property_bag_equal (const ECalComponentPropertyBag *expected,
 		g_assert_nonnull (prop_received);
 		g_assert_cmpint (i_cal_property_isa (prop_expected), ==, i_cal_property_isa (prop_received));
 
-		value_expected = i_cal_property_as_ical_string_r (prop_expected);
-		value_received = i_cal_property_as_ical_string_r (prop_received);
+		value_expected = i_cal_property_as_ical_string (prop_expected);
+		value_received = i_cal_property_as_ical_string (prop_received);
 
 		g_assert_cmpstr (value_expected, ==, value_received);
 
@@ -580,7 +580,7 @@ test_component_struct_alarm (void)
 				ECalComponentAlarmTrigger *trg;
 				ICalTime *tt;
 
-				tt = i_cal_time_from_string ("20201030T102030");
+				tt = i_cal_time_new_from_string ("20201030T102030");
 				g_assert_nonnull (tt);
 
 				trg = e_cal_component_alarm_trigger_new_absolute (tt);
@@ -590,7 +590,7 @@ test_component_struct_alarm (void)
 			} else {
 				ICalTime *tt;
 
-				tt = i_cal_time_from_string ("21211129T122233");
+				tt = i_cal_time_new_from_string ("21211129T122233");
 				g_assert_nonnull (tt);
 
 				e_cal_component_alarm_take_trigger (expected, e_cal_component_alarm_trigger_new_absolute (tt));
@@ -908,7 +908,7 @@ test_component_struct_alarm_repeat (void)
 		ICalDuration *dur;
 
 		if ((ii % 4) == 0) {
-			dur = i_cal_duration_from_int (values[ii].interval);
+			dur = i_cal_duration_new_from_int (values[ii].interval);
 			expected = e_cal_component_alarm_repeat_new (values[ii].repetitions, dur);
 			g_object_unref (dur);
 		} else if ((ii % 4) == 1) {
@@ -918,7 +918,7 @@ test_component_struct_alarm_repeat (void)
 			e_cal_component_alarm_repeat_set_repetitions (expected, values[ii].repetitions);
 			e_cal_component_alarm_repeat_set_interval_seconds (expected, values[ii].interval);
 		} else {
-			dur = i_cal_duration_from_int (values[ii].interval);
+			dur = i_cal_duration_new_from_int (values[ii].interval);
 
 			expected = e_cal_component_alarm_repeat_new_seconds (1000, 2000);
 			e_cal_component_alarm_repeat_set_repetitions (expected, values[ii].repetitions);
@@ -929,7 +929,7 @@ test_component_struct_alarm_repeat (void)
 
 		g_assert_nonnull (expected);
 
-		dur = i_cal_duration_from_int (values[ii].interval);
+		dur = i_cal_duration_new_from_int (values[ii].interval);
 		g_assert_nonnull (dur);
 		g_assert_cmpint (e_cal_component_alarm_repeat_get_repetitions (expected), ==, values[ii].repetitions);
 		g_assert_cmpint (e_cal_component_alarm_repeat_get_interval_seconds (expected), ==, values[ii].interval);
@@ -971,13 +971,13 @@ test_component_struct_alarm_trigger (void)
 			if (set_kind == 0) {
 				/* nothing, create it as it should be */
 			} else if (set_kind == 1) {
-				dur = i_cal_duration_from_int (33);
+				dur = i_cal_duration_new_from_int (33);
 				expected = e_cal_component_alarm_trigger_new_relative (E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_END, dur);
 				g_object_unref (dur);
 
 				g_assert_nonnull (expected);
 			} else if (set_kind == 2) {
-				tt = i_cal_time_today ();
+				tt = i_cal_time_new_today ();
 				expected = e_cal_component_alarm_trigger_new_absolute (tt);
 				g_object_unref (tt);
 
@@ -989,34 +989,34 @@ test_component_struct_alarm_trigger (void)
 			if (expected) {
 				if (values[ii].kind == e_cal_component_alarm_trigger_get_kind (expected)) {
 					if (values[ii].kind == E_CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE) {
-						tt = i_cal_time_from_string (values[ii].abs_time);
+						tt = i_cal_time_new_from_string (values[ii].abs_time);
 						e_cal_component_alarm_trigger_set_absolute_time (expected, tt);
 						g_object_unref (tt);
 					} else {
-						dur = i_cal_duration_from_int (values[ii].duration);
+						dur = i_cal_duration_new_from_int (values[ii].duration);
 						e_cal_component_alarm_trigger_set_kind (expected, values[ii].kind);
 						e_cal_component_alarm_trigger_set_duration (expected, dur);
 						g_object_unref (dur);
 					}
 				} else if (values[ii].kind == E_CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE) {
-					tt = i_cal_time_from_string (values[ii].abs_time);
+					tt = i_cal_time_new_from_string (values[ii].abs_time);
 					e_cal_component_alarm_trigger_set_absolute (expected, tt);
 					g_object_unref (tt);
 				} else {
-					dur = i_cal_duration_from_int (values[ii].duration);
+					dur = i_cal_duration_new_from_int (values[ii].duration);
 					e_cal_component_alarm_trigger_set_relative (expected, values[ii].kind, dur);
 					g_object_unref (dur);
 				}
 			} else {
 				if (values[ii].kind == E_CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE) {
-					tt = i_cal_time_from_string (values[ii].abs_time);
+					tt = i_cal_time_new_from_string (values[ii].abs_time);
 					expected = e_cal_component_alarm_trigger_new_absolute (tt);
 					g_assert_nonnull (expected);
 					g_assert_nonnull (e_cal_component_alarm_trigger_get_absolute_time (expected));
 					verify_ical_timetype_equal (tt, e_cal_component_alarm_trigger_get_absolute_time (expected));
 					g_object_unref (tt);
 				} else {
-					dur = i_cal_duration_from_int (values[ii].duration);
+					dur = i_cal_duration_new_from_int (values[ii].duration);
 					expected = e_cal_component_alarm_trigger_new_relative (values[ii].kind, dur);
 					g_assert_nonnull (expected);
 					g_object_unref (dur);
@@ -1030,12 +1030,12 @@ test_component_struct_alarm_trigger (void)
 
 			g_assert_cmpint (values[ii].kind, ==, e_cal_component_alarm_trigger_get_kind (expected));
 			if (values[ii].kind == E_CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE) {
-				tt = i_cal_time_from_string (values[ii].abs_time);
+				tt = i_cal_time_new_from_string (values[ii].abs_time);
 				g_assert_nonnull (tt);
 				verify_ical_timetype_equal (tt, e_cal_component_alarm_trigger_get_absolute_time (expected));
 				g_object_unref (tt);
 			} else {
-				dur = i_cal_duration_from_int (values[ii].duration);
+				dur = i_cal_duration_new_from_int (values[ii].duration);
 				g_assert_nonnull (dur);
 				verify_ical_durationtype_equal (dur, e_cal_component_alarm_trigger_get_duration (expected));
 				g_object_unref (dur);
@@ -1052,14 +1052,14 @@ test_component_struct_alarm_trigger (void)
 			verify_struct_alarm_trigger_equal (expected, received);
 			e_cal_component_alarm_trigger_free (received);
 
-			dur = i_cal_duration_from_int (33);
+			dur = i_cal_duration_new_from_int (33);
 			received = e_cal_component_alarm_trigger_new_relative (E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_END, dur);
 			g_object_unref (dur);
 			e_cal_component_alarm_trigger_set_from_property (received, prop);
 			verify_struct_alarm_trigger_equal (expected, received);
 			e_cal_component_alarm_trigger_free (received);
 
-			tt = i_cal_time_today ();
+			tt = i_cal_time_new_today ();
 			received = e_cal_component_alarm_trigger_new_absolute (tt);
 			g_object_unref (tt);
 			e_cal_component_alarm_trigger_set_from_property (received, prop);
@@ -1250,15 +1250,15 @@ test_component_struct_datetime (void)
 			ICalTime *tt;
 
 			if (set_kind == 2) {
-				tt = i_cal_time_from_string ("19981019");
+				tt = i_cal_time_new_from_string ("19981019");
 				expected = e_cal_component_datetime_new (tt, NULL);
 				g_object_unref (tt);
 			} else if (set_kind == 3) {
-				tt = i_cal_time_from_string ("19981019");
+				tt = i_cal_time_new_from_string ("19981019");
 				expected = e_cal_component_datetime_new_take (tt, g_strdup ("Unknown"));
 			}
 
-			tt = i_cal_time_from_string (values[ii].time);
+			tt = i_cal_time_new_from_string (values[ii].time);
 			g_assert_nonnull (tt);
 
 			if (expected) {
@@ -1267,7 +1267,7 @@ test_component_struct_datetime (void)
 				} else if (((set_kind + ii) % 3) == 1) {
 					ICalTime *ttcopy;
 
-					ttcopy = i_cal_time_new_clone (tt);
+					ttcopy = i_cal_time_clone (tt);
 					g_assert_nonnull (ttcopy);
 
 					e_cal_component_datetime_take_value (expected, ttcopy);
@@ -1282,7 +1282,7 @@ test_component_struct_datetime (void)
 				} else {
 					ICalTime *ttcopy;
 
-					ttcopy = i_cal_time_new_clone (tt);
+					ttcopy = i_cal_time_clone (tt);
 					g_assert_nonnull (ttcopy);
 
 					expected = e_cal_component_datetime_new_take (ttcopy, g_strdup (values[ii].tzid));
@@ -1666,23 +1666,23 @@ test_component_struct_period (void)
 			ICalTime *start, *end = NULL;
 			ICalDuration *duration = NULL;
 
-			start = i_cal_time_from_string (values[ii].start);
+			start = i_cal_time_new_from_string (values[ii].start);
 			g_assert_nonnull (start);
 			if (values[ii].duration == -1) {
 				if (values[ii].end) {
-					end = i_cal_time_from_string (values[ii].end);
+					end = i_cal_time_new_from_string (values[ii].end);
 					g_assert_nonnull (end);
 				}
 			} else {
-				duration = i_cal_duration_from_int (values[ii].duration);
+				duration = i_cal_duration_new_from_int (values[ii].duration);
 				g_assert_nonnull (duration);
 			}
 
 			if ((set_kind % 3) == 1) {
 				ICalTime *ttstart, *ttend;
 
-				ttstart = i_cal_time_from_string ("19981019");
-				ttend = i_cal_time_from_string ("19981019");
+				ttstart = i_cal_time_new_from_string ("19981019");
+				ttend = i_cal_time_new_from_string ("19981019");
 
 				g_assert_nonnull (ttstart);
 
@@ -1694,8 +1694,8 @@ test_component_struct_period (void)
 				ICalTime *ttstart;
 				ICalDuration *ttduration;
 
-				ttstart = i_cal_time_from_string ("19981019");
-				ttduration = i_cal_duration_from_int (123456);
+				ttstart = i_cal_time_new_from_string ("19981019");
+				ttduration = i_cal_duration_new_from_int (123456);
 				g_assert_nonnull (ttstart);
 				g_assert_nonnull (ttduration);
 
@@ -1989,15 +1989,15 @@ test_component_struct_range (void)
 				ECalComponentDateTime *dt;
 
 				if (set_kind == 2) {
-					dt = e_cal_component_datetime_new_take (i_cal_time_from_string ("19981019"), NULL);
+					dt = e_cal_component_datetime_new_take (i_cal_time_new_from_string ("19981019"), NULL);
 					expected = e_cal_component_range_new (E_CAL_COMPONENT_RANGE_SINGLE, dt);
 					e_cal_component_datetime_free (dt);
 				} else if (set_kind == 3) {
-					dt = e_cal_component_datetime_new_take (i_cal_time_from_string ("19981019"), NULL);
+					dt = e_cal_component_datetime_new_take (i_cal_time_new_from_string ("19981019"), NULL);
 					expected = e_cal_component_range_new_take (E_CAL_COMPONENT_RANGE_SINGLE, dt);
 				}
 
-				dt = e_cal_component_datetime_new_take (i_cal_time_from_string (values[ii].time), g_strdup (values[ii].tzid));
+				dt = e_cal_component_datetime_new_take (i_cal_time_new_from_string (values[ii].time), g_strdup (values[ii].tzid));
 				g_assert_nonnull (dt);
 
 				if (expected) {
@@ -2114,14 +2114,14 @@ verify_changes (ECalComponent *comp,
 
 	icalcomp = e_cal_component_get_icalcomponent (comp);
 	g_assert_nonnull (icalcomp);
-	clone = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (icalcomp));
+	clone = e_cal_component_new_from_icalcomponent (i_cal_component_clone (icalcomp));
 	g_assert_nonnull (clone);
 	verify_func (clone, user_data);
 	g_object_unref (clone);
 
 	icalcomp = e_cal_component_get_icalcomponent (comp);
 	g_assert_nonnull (icalcomp);
-	icalcomp = i_cal_component_new_clone (icalcomp);
+	icalcomp = i_cal_component_clone (icalcomp);
 	g_assert_nonnull (icalcomp);
 	clone = e_cal_component_new ();
 	g_assert_nonnull (clone);
@@ -2461,7 +2461,7 @@ test_component_icaltime (void (* set_func) (ECalComponent *comp,
 		ICalTime *tt;
 
 		if (values[ii]) {
-			tt = i_cal_time_from_string (values[ii]);
+			tt = i_cal_time_new_from_string (values[ii]);
 			g_assert_nonnull (tt);
 		} else if (!can_null_value) {
 			continue;
@@ -2526,7 +2526,7 @@ test_component_datetime (void (* set_func) (ECalComponent *comp,
 		ECalComponentDateTime *dt;
 
 		if (values[ii].time) {
-			dt = e_cal_component_datetime_new_take (i_cal_time_from_string (values[ii].time), g_strdup (values[ii].tzid));
+			dt = e_cal_component_datetime_new_take (i_cal_time_new_from_string (values[ii].time), g_strdup (values[ii].tzid));
 			g_assert_nonnull (dt);
 
 			if (values[ii].tzid) {
@@ -2615,9 +2615,9 @@ verify_component_rules (GSList * (* get_func) (ECalComponent *comp),
 				rt_received_prop = i_cal_property_get_rrule (prop_received);
 			}
 
-			str_expected = i_cal_recurrence_as_string_r (rt_expected);
-			str_received = i_cal_recurrence_as_string_r (rt_received);
-			str_received_prop = i_cal_recurrence_as_string_r (rt_received_prop);
+			str_expected = i_cal_recurrence_to_string (rt_expected);
+			str_received = i_cal_recurrence_to_string (rt_received);
+			str_received_prop = i_cal_recurrence_to_string (rt_received_prop);
 
 			g_assert_cmpstr (str_expected, ==, str_received);
 			g_assert_cmpstr (str_expected, ==, str_received_prop);
@@ -2664,7 +2664,7 @@ test_component_rules (void (* set_func) (ECalComponent *comp,
 		if (values[ii]) {
 			ICalRecurrence *rt;
 
-			rt = i_cal_recurrence_from_string (values[ii]);
+			rt = i_cal_recurrence_new_from_string (values[ii]);
 			g_assert_nonnull (rt);
 
 			rules = g_slist_prepend (rules, rt);
@@ -2861,7 +2861,7 @@ test_component_exdates (void)
 		if (values[ii].time) {
 			ECalComponentDateTime *dt;
 
-			dt = e_cal_component_datetime_new_take (i_cal_time_from_string (values[ii].time), g_strdup (values[ii].tzid));
+			dt = e_cal_component_datetime_new_take (i_cal_time_new_from_string (values[ii].time), g_strdup (values[ii].tzid));
 			g_assert_nonnull (dt);
 
 			if (values[ii].tzid) {
@@ -3150,7 +3150,7 @@ test_component_recurid (void)
 		if (values[ii].time) {
 			ECalComponentDateTime *dt;
 
-			dt = e_cal_component_datetime_new_take (i_cal_time_from_string (values[ii].time), g_strdup (values[ii].tzid));
+			dt = e_cal_component_datetime_new_take (i_cal_time_new_from_string (values[ii].time), g_strdup (values[ii].tzid));
 			g_assert_nonnull (dt);
 
 			if (values[ii].tzid) {
@@ -3242,16 +3242,16 @@ test_component_rdates (void)
 			ICalDuration *duration = NULL;
 			ECalComponentPeriod *period;
 
-			start = i_cal_time_from_string (values[ii].start);
+			start = i_cal_time_new_from_string (values[ii].start);
 			g_assert_nonnull (start);
 			if (values[ii].duration == -1) {
 				if (values[ii].end) {
-					end = i_cal_time_from_string (values[ii].end);
+					end = i_cal_time_new_from_string (values[ii].end);
 					g_assert_nonnull (end);
 				}
 				period = e_cal_component_period_new_datetime (start, end);
 			} else {
-				duration = i_cal_duration_from_int (values[ii].duration);
+				duration = i_cal_duration_new_from_int (values[ii].duration);
 				g_assert_nonnull (duration);
 				period = e_cal_component_period_new_duration (start, duration);
 			}
@@ -3874,7 +3874,7 @@ test_component_alarms (void)
 			ECalComponentAlarmTriggerKind kind;
 			ICalDuration *duration;
 
-			duration = i_cal_duration_from_int (values[ii].trigger * 60);
+			duration = i_cal_duration_new_from_int (values[ii].trigger * 60);
 			if (values[ii].trigger < 0)
 				kind = E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START;
 			else
diff --git a/tests/libecal/test-cal-recur.c b/tests/libecal/test-cal-recur.c
index b9d26097d..2916e837b 100644
--- a/tests/libecal/test-cal-recur.c
+++ b/tests/libecal/test-cal-recur.c
@@ -116,9 +116,9 @@ instance_new (ICalTime *start,
 	Instance *ins;
 
 	ins = g_new0 (Instance, 1);
-	ins->start = i_cal_time_new_clone (start);
-	ins->end = i_cal_time_new_clone (end);
-	ins->icomp = i_cal_component_new_clone (icomp);
+	ins->start = i_cal_time_clone (start);
+	ins->end = i_cal_time_clone (end);
+	ins->icomp = i_cal_component_clone (icomp);
 
 	return ins;
 }
@@ -175,7 +175,7 @@ verify_received_instances (GHashTable *instances,
 		ICalTime *expected_start;
 		Instance ins = { 0, };
 
-		expected_start = i_cal_time_from_string (expected_times[ii]);
+		expected_start = i_cal_time_new_from_string (expected_times[ii]);
 		g_assert_nonnull (expected_start);
 
 		ins.start = expected_start;
@@ -236,8 +236,8 @@ test_recur_plain_run (ECalClient *client,
 		g_assert_nonnull (comp_zone);
 
 	icomp = create_component (comp_tz);
-	start = i_cal_time_from_string ("20190103T080000Z");
-	end = i_cal_time_from_string ("20190115T080000Z");
+	start = i_cal_time_new_from_string ("20190103T080000Z");
+	end = i_cal_time_new_from_string ("20190115T080000Z");
 
 	rd.instances = g_hash_table_new_full (instance_hash, instance_equal, instance_free, NULL);
 
@@ -279,8 +279,8 @@ test_recur_client_run (ECalClient *client,
 	e_cal_client_set_default_timezone (client, default_zone);
 	setup_cal (client, comp_tz);
 
-	start = i_cal_time_from_string ("20190103T080000Z");
-	end = i_cal_time_from_string ("20190115T080000Z");
+	start = i_cal_time_new_from_string ("20190103T080000Z");
+	end = i_cal_time_new_from_string ("20190115T080000Z");
 
 	rd.instances = g_hash_table_new_full (instance_hash, instance_equal, instance_free, NULL);
 
diff --git a/tests/libedata-cal/test-cal-cache-intervals.c b/tests/libedata-cal/test-cal-cache-intervals.c
index 28a05e7e3..7daae20b5 100644
--- a/tests/libedata-cal/test-cal-cache-intervals.c
+++ b/tests/libedata-cal/test-cal-cache-intervals.c
@@ -78,8 +78,8 @@ search_in_intervals (ETimezoneCache *zone_cache,
 	GSList *link;
 	GHashTable *res;
 
-	itt_start = i_cal_time_from_timet_with_zone (start, FALSE, NULL);
-	itt_end = i_cal_time_from_timet_with_zone (end, FALSE, NULL);
+	itt_start = i_cal_time_new_from_timet_with_zone (start, FALSE, NULL);
+	itt_end = i_cal_time_new_from_timet_with_zone (end, FALSE, NULL);
 
 	expr = g_strdup_printf ("(occur-in-time-range? (make-time \"%04d%02d%02dT%02d%02d%02dZ\") (make-time \"%04d%02d%02dT%02d%02d%02dZ\"))",
 		i_cal_time_get_year (itt_start), i_cal_time_get_month (itt_start), i_cal_time_get_day (itt_start),
@@ -151,14 +151,14 @@ create_test_component (time_t start,
 
 	e_cal_component_set_new_vtype (comp, E_CAL_COMPONENT_EVENT);
 
-	ittstart = i_cal_time_from_timet_with_zone (start, 0, NULL);
-	ittend = i_cal_time_from_timet_with_zone (end, 0, NULL);
+	ittstart = i_cal_time_new_from_timet_with_zone (start, 0, NULL);
+	ittend = i_cal_time_new_from_timet_with_zone (end, 0, NULL);
 
 	i_cal_component_set_dtstart (e_cal_component_get_icalcomponent (comp), ittstart);
 	i_cal_component_set_dtend (e_cal_component_get_icalcomponent (comp), ittend);
 
-	startstr = i_cal_time_as_ical_string_r (ittstart);
-	endstr = i_cal_time_as_ical_string_r (ittend);
+	startstr = i_cal_time_as_ical_string (ittstart);
+	endstr = i_cal_time_as_ical_string (ittend);
 
 	tmp = g_strdup_printf ("%s - %s", startstr, endstr);
 	summary = e_cal_component_text_new (tmp, NULL);
@@ -173,7 +173,7 @@ create_test_component (time_t start,
 
 	e_cal_component_text_free (summary);
 
-	current = i_cal_time_from_timet_with_zone (time (NULL), 0, NULL);
+	current = i_cal_time_new_from_timet_with_zone (time (NULL), 0, NULL);
 	e_cal_component_set_created (comp, current);
 	e_cal_component_set_last_modified (comp, current);
 	g_object_unref (current);
diff --git a/tests/libedata-cal/test-cal-meta-backend.c b/tests/libedata-cal/test-cal-meta-backend.c
index 2ffe80aa7..3d305de56 100644
--- a/tests/libedata-cal/test-cal-meta-backend.c
+++ b/tests/libedata-cal/test-cal-meta-backend.c
@@ -96,7 +96,7 @@ ecmb_test_get_rid_as_string (ICalComponent *icomp)
 		ICalTime *itt;
 
 		itt = i_cal_component_get_recurrenceid (icomp);
-		rid = i_cal_time_as_ical_string_r (itt);
+		rid = i_cal_time_as_ical_string (itt);
 		g_clear_object (&itt);
 	}
 
@@ -495,7 +495,7 @@ e_cal_meta_backend_test_save_component_sync (ECalMetaBackend *meta_backend,
 		comp_uid = i_cal_component_get_uid (icomp);
 		g_assert_cmpstr (uid, ==, comp_uid);
 
-		i_cal_component_take_component (test_backend->vcalendar, i_cal_component_new_clone (icomp));
+		i_cal_component_take_component (test_backend->vcalendar, i_cal_component_clone (icomp));
 	}
 
 	*out_new_uid = g_strdup (uid);
@@ -539,7 +539,7 @@ e_cal_meta_backend_test_load_component_sync (ECalMetaBackend *meta_backend,
 			if (!*out_instances)
 				*out_instances = e_cal_util_new_top_level ();
 
-			i_cal_component_take_component (*out_instances, i_cal_component_new_clone (icomp));
+			i_cal_component_take_component (*out_instances, i_cal_component_clone (icomp));
 		}
 	}
 
@@ -1078,7 +1078,7 @@ test_attachments (TCUFixture *fixture,
 	g_assert (success);
 	g_assert_nonnull (comp);
 
-	icomp = i_cal_component_new_clone (e_cal_component_get_icalcomponent (comp));
+	icomp = i_cal_component_clone (e_cal_component_get_icalcomponent (comp));
 	g_assert_nonnull (icomp);
 	g_assert_cmpint (i_cal_component_count_properties (icomp, I_CAL_ATTACH_PROPERTY), ==, 1);
 
@@ -1857,11 +1857,11 @@ test_get_free_busy (ECalMetaBackend *meta_backend)
 	users = g_slist_prepend (NULL, (gpointer) "user@no.where");
 	users = g_slist_prepend (users, (gpointer) "unknown@no.where");
 
-	itt = i_cal_time_from_string ("20170102T080000Z");
+	itt = i_cal_time_new_from_string ("20170102T080000Z");
 	start = i_cal_time_as_timet (itt);
 	g_object_unref (itt);
 
-	itt = i_cal_time_from_string ("20170102T200000Z");
+	itt = i_cal_time_new_from_string ("20170102T200000Z");
 	end = i_cal_time_as_timet (itt);
 	g_object_unref (itt);
 
@@ -2058,12 +2058,12 @@ ecmb_test_modify_case (const gchar *case_name,
 	if (ridstr) {
 		ICalTime *itt;
 
-		itt = i_cal_time_from_string (ridstr);
+		itt = i_cal_time_new_from_string (ridstr);
 		i_cal_component_set_recurrenceid (icomp, itt);
 		g_object_unref (itt);
 	}
 
-	calobj = i_cal_component_as_ical_string_r (icomp);
+	calobj = i_cal_component_as_ical_string (icomp);
 	g_object_unref (icomp);
 
 	return calobj;
@@ -2466,7 +2466,7 @@ test_receive_objects (ECalMetaBackend *meta_backend)
 
 	g_free (calobj);
 
-	i_cal_component_take_component (test_backend->vcalendar, i_cal_component_new_clone (firsticomp));
+	i_cal_component_take_component (test_backend->vcalendar, i_cal_component_clone (firsticomp));
 
 	g_object_unref (firsticomp);
 	g_object_unref (icomp);
diff --git a/tests/libedata-cal/test-intervaltree.c b/tests/libedata-cal/test-intervaltree.c
index 5f724d3fc..feccddce7 100644
--- a/tests/libedata-cal/test-intervaltree.c
+++ b/tests/libedata-cal/test-intervaltree.c
@@ -147,11 +147,11 @@ create_test_component (time_t start,
 	e_cal_component_set_new_vtype (comp, E_CAL_COMPONENT_EVENT);
 
 	/*
-	dt = e_cal_component_datetime_new_take (i_cal_time_from_timet_with_zone (start, 0, NULL), NULL);
+	dt = e_cal_component_datetime_new_take (i_cal_time_new_from_timet_with_zone (start, 0, NULL), NULL);
 	e_cal_component_set_dtstart (comp, dt);
 	e_cal_component_datetime_free (dt);
 
-	dt = e_cal_component_datetime_new_take (i_cal_time_from_timet_with_zone (end, 0, NULL), NULL);
+	dt = e_cal_component_datetime_new_take (i_cal_time_new_from_timet_with_zone (end, 0, NULL), NULL);
 	e_cal_component_set_dtend (comp, dt);
 	e_cal_component_datetime_free (dt);
 	*/
@@ -164,7 +164,7 @@ create_test_component (time_t start,
 
 	g_free (txt);
 
-	current = i_cal_time_from_timet_with_zone (time (NULL), 0, NULL);
+	current = i_cal_time_new_from_timet_with_zone (time (NULL), 0, NULL);
 	e_cal_component_set_created (comp, current);
 	e_cal_component_set_last_modified (comp, current);
 	g_clear_object (&current);