[evolution-ews/wip/mcrha/eds-libical-glib] Adapt to the latest libical-glib API changes
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-ews/wip/mcrha/eds-libical-glib] Adapt to the latest libical-glib API changes
- Date: Thu, 2 May 2019 11:39:59 +0000 (UTC)
commit a7fa3d5940b819e65b0a441afc467dd318f98211
Author: Milan Crha <mcrha redhat com>
Date: Thu May 2 13:41:38 2019 +0200
Adapt to the latest libical-glib API changes
src/calendar/e-cal-backend-ews-utils.c | 22 ++++-----
src/calendar/e-cal-backend-ews.c | 86 +++++++++++++++++-----------------
src/camel/camel-ews-folder.c | 2 +-
src/server/e-ews-calendar-utils.c | 16 +++----
src/server/e-ews-connection.c | 6 +--
src/server/e-ews-item.c | 2 +-
6 files changed, 67 insertions(+), 67 deletions(-)
---
diff --git a/src/calendar/e-cal-backend-ews-utils.c b/src/calendar/e-cal-backend-ews-utils.c
index 2b288156..3c0ace09 100644
--- a/src/calendar/e-cal-backend-ews-utils.c
+++ b/src/calendar/e-cal-backend-ews-utils.c
@@ -482,8 +482,8 @@ ewscal_add_timechange (ESoapMessage *msg,
utcoffs = -i_cal_property_get_tzoffsetto (prop);
utcoffs -= baseoffs;
- duration = i_cal_duration_from_int (utcoffs);
- offset = i_cal_duration_as_ical_string_r (duration);
+ duration = i_cal_duration_new_from_int (utcoffs);
+ offset = i_cal_duration_as_ical_string (duration);
e_ews_message_write_string_parameter (msg, "Offset", NULL, offset);
g_clear_object (&duration);
@@ -713,8 +713,8 @@ ewscal_set_meeting_timezone (ESoapMessage *msg,
* zones are offset from. It's redundant, but Exchange always sets it
* to the offset of the Standard zone, and the Offset in the Standard
* zone to zero. So try to avoid problems by doing the same. */
- duration = i_cal_duration_from_int (std_utcoffs);
- offset = i_cal_duration_as_ical_string_r (duration);
+ duration = i_cal_duration_new_from_int (std_utcoffs);
+ offset = i_cal_duration_as_ical_string (duration);
e_ews_message_write_string_parameter (msg, "BaseOffset", NULL, offset);
g_clear_object (&duration);
free (offset);
@@ -1078,7 +1078,7 @@ convert_categories_calcomp_to_xml (ESoapMessage *msg,
if (comp) {
g_object_ref (comp);
} else {
- ICalComponent *clone = i_cal_component_new_clone (icomp);
+ ICalComponent *clone = i_cal_component_clone (icomp);
comp = e_cal_component_new_from_icalcomponent (clone);
if (!comp)
@@ -1152,7 +1152,7 @@ convert_vevent_calcomp_to_xml (ESoapMessage *msg,
const gchar *ical_location_start, *ical_location_end, *value;
const gchar *msdn_location_start, *msdn_location_end;
- 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)
return FALSE;
@@ -1394,7 +1394,7 @@ convert_vtodo_calcomp_to_xml (ESoapMessage *msg,
/* has_alarms = e_cal_util_component_has_property (icomp, I_CAL_VALARM_COMPONENT);
if (has_alarms) {
- ECalComponent *comp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone
(icomp));
+ ECalComponent *comp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (icomp));
if (comp && e_cal_component_has_alarms (comp)) {
ews_set_alarm (msg, comp, convert_data->timezone_cache, convert_data->vcalendar,
TRUE);
@@ -1555,7 +1555,7 @@ convert_vevent_component_to_updatexml (ESoapMessage *msg,
/* A single occurrence ? */
prop = i_cal_component_get_first_property (icomp, I_CAL_RECURRENCEID_PROPERTY);
if (prop != NULL) {
- recid = i_cal_property_get_value_as_string_r (prop);
+ recid = i_cal_property_get_value_as_string (prop);
e_ews_message_start_item_change (
msg,
E_EWS_ITEMCHANGE_TYPE_OCCURRENCEITEM,
@@ -1790,13 +1790,13 @@ convert_vevent_component_to_updatexml (ESoapMessage *msg,
rrule_old_value = NULL;
prop = i_cal_component_get_first_property (icomp_old, I_CAL_RRULE_PROPERTY);
if (prop) {
- rrule_old_value = i_cal_property_get_value_as_string_r (prop);
+ rrule_old_value = i_cal_property_get_value_as_string (prop);
g_object_unref (prop);
}
prop = i_cal_component_get_first_property (icomp, I_CAL_RRULE_PROPERTY);
if (prop)
- rrule_value = i_cal_property_get_value_as_string_r (prop);
+ rrule_value = i_cal_property_get_value_as_string (prop);
if (prop && g_strcmp0 (rrule_value, rrule_old_value)) {
e_ews_message_start_set_item_field (msg, "Recurrence", "calendar", "CalendarItem");
@@ -2115,7 +2115,7 @@ e_cal_backend_ews_rid_to_index (ICalTimezone *timezone,
* we set the timezone as we cannot identify if it has a valid timezone or not */
i_cal_time_set_timezone (dtstart, timezone);
- o_time = i_cal_time_from_string (rid);
+ o_time = i_cal_time_new_from_string (rid);
i_cal_time_set_timezone (o_time, timezone);
ritr = i_cal_recur_iterator_new (rrule, dtstart);
diff --git a/src/calendar/e-cal-backend-ews.c b/src/calendar/e-cal-backend-ews.c
index 7742e44d..fb3d9808 100644
--- a/src/calendar/e-cal-backend-ews.c
+++ b/src/calendar/e-cal-backend-ews.c
@@ -362,7 +362,7 @@ ecb_ews_item_to_component_sync (ECalBackendEws *cbews,
i_cal_component_take_property (icomp, prop);
/*date time created*/
- itt = i_cal_time_from_timet_with_zone (e_ews_item_get_date_created (item), 0, utc_zone);
+ itt = i_cal_time_new_from_timet_with_zone (e_ews_item_get_date_created (item), 0, utc_zone);
prop = i_cal_property_new_created (itt);
i_cal_component_take_property (icomp, prop);
g_clear_object (&itt);
@@ -433,7 +433,7 @@ ecb_ews_item_to_component_sync (ECalBackendEws *cbews,
has_this_date = FALSE;
e_ews_item_task_has_start_date (item, &has_this_date);
if (has_this_date) {
- itt = i_cal_time_from_timet_with_zone (e_ews_item_get_start_date (item), 0,
user_timezone);
+ itt = i_cal_time_new_from_timet_with_zone (e_ews_item_get_start_date (item),
0, user_timezone);
i_cal_time_set_is_date (itt, TRUE);
prop = i_cal_property_new_dtstart (itt);
i_cal_component_take_property (icomp, prop);
@@ -463,7 +463,7 @@ ecb_ews_item_to_component_sync (ECalBackendEws *cbews,
/*due date*/
e_ews_item_task_has_due_date (item, &has_this_date);
if (has_this_date) {
- itt = i_cal_time_from_timet_with_zone (e_ews_item_get_due_date (item), 0,
user_timezone);
+ itt = i_cal_time_new_from_timet_with_zone (e_ews_item_get_due_date (item), 0,
user_timezone);
i_cal_time_set_is_date (itt, TRUE);
prop = i_cal_property_new_due (itt);
i_cal_component_take_property (icomp, prop);
@@ -474,7 +474,7 @@ ecb_ews_item_to_component_sync (ECalBackendEws *cbews,
has_this_date = FALSE;
e_ews_item_task_has_complete_date (item, &has_this_date);
if (has_this_date) {
- itt = i_cal_time_from_timet_with_zone (e_ews_item_get_complete_date (item),
0, user_timezone);
+ itt = i_cal_time_new_from_timet_with_zone (e_ews_item_get_complete_date
(item), 0, user_timezone);
prop = i_cal_property_new_completed (itt);
i_cal_component_take_property (icomp, prop);
g_clear_object (&itt);
@@ -507,12 +507,12 @@ ecb_ews_item_to_component_sync (ECalBackendEws *cbews,
ICalComponent *alarm_icomp;
dtstart = e_cal_backend_ews_get_datetime_with_zone (timezone_cache,
NULL, icomp, I_CAL_DTSTART_PROPERTY, i_cal_property_get_dtstart);
- due_by = i_cal_time_from_timet_with_zone (reminder_due_by, 0,
utc_zone);
+ due_by = i_cal_time_new_from_timet_with_zone (reminder_due_by, 0,
utc_zone);
if (!dtstart || i_cal_time_is_null_time (dtstart)) {
g_clear_object (&dtstart);
- dtstart = i_cal_time_new_clone (due_by);
+ dtstart = i_cal_time_clone (due_by);
i_cal_time_set_is_date (dtstart, TRUE);
i_cal_component_set_dtstart (icomp, dtstart);
@@ -694,7 +694,7 @@ ecb_ews_item_to_component_sync (ECalBackendEws *cbews,
new_tzid = g_strconcat ("/evolution/ews/tzid/",
i_cal_component_get_uid (icomp), NULL);
zone = i_cal_timezone_new ();
- clone = i_cal_component_new_clone (vtimezone);
+ clone = i_cal_component_clone (vtimezone);
g_object_unref (vtimezone);
vtimezone = clone;
@@ -894,7 +894,7 @@ ecb_ews_item_to_component_sync (ECalBackendEws *cbews,
e_cal_util_component_set_x_property (icomp, "X-EVOLUTION-ITEMID", item_id->id);
e_cal_util_component_set_x_property (icomp, "X-EVOLUTION-CHANGEKEY", item_id->change_key);
- res_component = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (icomp));
+ res_component = e_cal_component_new_from_icalcomponent (i_cal_component_clone (icomp));
/* Categories */
e_cal_component_set_categories_list (res_component, (GSList *) e_ews_item_get_categories
(item));
@@ -1447,7 +1447,7 @@ ecb_ews_components_to_infos (ECalMetaBackend *meta_backend,
}
nfo = e_cal_meta_backend_info_new (uid, revision, NULL, itemid);
- nfo->object = i_cal_component_as_ical_string_r (merged);
+ nfo->object = i_cal_component_as_ical_string (merged);
nfos = g_slist_prepend (nfos, nfo);
@@ -1730,9 +1730,9 @@ ecb_ews_get_changes_sync (ECalMetaBackend *meta_backend,
continue;
fb = i_cal_property_get_freebusy (fbprop);
- id = i_cal_property_get_parameter_as_string_r (fbprop, "X-EWS-ID");
- summary = i_cal_property_get_parameter_as_string_r (fbprop,
"X-SUMMARY");
- location = i_cal_property_get_parameter_as_string_r (fbprop,
"X-LOCATION");
+ id = i_cal_property_get_parameter_as_string (fbprop, "X-EWS-ID");
+ summary = i_cal_property_get_parameter_as_string (fbprop,
"X-SUMMARY");
+ location = i_cal_property_get_parameter_as_string (fbprop,
"X-LOCATION");
vevent = i_cal_component_new_vevent ();
@@ -1742,11 +1742,11 @@ ecb_ews_get_changes_sync (ECalMetaBackend *meta_backend,
gchar *uid, *start, *end;
itt = i_cal_period_get_start (fb);
- start = i_cal_time_as_ical_string_r (itt);
+ start = i_cal_time_as_ical_string (itt);
g_clear_object (&itt);
itt = i_cal_period_get_end (fb);
- end = i_cal_time_as_ical_string_r (itt);
+ end = i_cal_time_as_ical_string (itt);
g_clear_object (&itt);
uid = g_strdup_printf ("%s-%s-%d", start, end, (gint) fbtype);
@@ -1768,7 +1768,7 @@ ecb_ews_get_changes_sync (ECalMetaBackend *meta_backend,
i_cal_component_set_dtend (vevent, itt);
g_clear_object (&itt);
- itt = i_cal_time_current_time_with_zone (utc_zone);
+ itt = i_cal_time_new_current_with_zone (utc_zone);
i_cal_component_take_property (vevent, i_cal_property_new_created
(itt));
g_clear_object (&itt);
@@ -1804,7 +1804,7 @@ ecb_ews_get_changes_sync (ECalMetaBackend *meta_backend,
nfo = e_cal_meta_backend_info_new
(i_cal_component_get_uid (vevent), NULL, NULL, NULL);
nfo->revision = revision;
- nfo->object = i_cal_component_as_ical_string_r
(vevent);
+ nfo->object = i_cal_component_as_ical_string (vevent);
*out_created_objects = g_slist_prepend
(*out_created_objects, nfo);
}
@@ -1818,7 +1818,7 @@ ecb_ews_get_changes_sync (ECalMetaBackend *meta_backend,
nfo = e_cal_meta_backend_info_new (i_cal_component_get_uid
(vevent), NULL, NULL, NULL);
nfo->revision = revision;
- nfo->object = i_cal_component_as_ical_string_r (vevent);
+ nfo->object = i_cal_component_as_ical_string (vevent);
*out_modified_objects = g_slist_prepend
(*out_modified_objects, nfo);
}
@@ -1993,10 +1993,10 @@ ecb_ews_load_component_sync (ECalMetaBackend *meta_backend,
continue;
i_cal_component_take_component (*out_component,
- i_cal_component_new_clone (e_cal_component_get_icalcomponent
(comp)));
+ i_cal_component_clone (e_cal_component_get_icalcomponent
(comp)));
}
} else {
- *out_component = i_cal_component_new_clone (e_cal_component_get_icalcomponent
(components->data));
+ *out_component = i_cal_component_clone (e_cal_component_get_icalcomponent
(components->data));
}
} else {
success = FALSE;
@@ -2080,8 +2080,8 @@ ecb_ews_components_equal (ECalComponent *comp1,
if (i_cal_property_count_parameters (prop1) != i_cal_property_count_parameters
(prop2))
continue;
- str1 = i_cal_property_as_ical_string_r (prop1);
- str2 = i_cal_property_as_ical_string_r (prop2);
+ str1 = i_cal_property_as_ical_string (prop1);
+ str2 = i_cal_property_as_ical_string (prop2);
same = g_strcmp0 (str1, str2) == 0;
@@ -2273,7 +2273,7 @@ ecb_ews_extract_attachments (ICalComponent *icomp,
g_free (decoded);
}
- attachid = i_cal_property_get_parameter_as_string_r (prop, "X-EWS-ATTACHMENTID");
+ attachid = i_cal_property_get_parameter_as_string (prop, "X-EWS-ATTACHMENTID");
e_ews_attachment_info_set_id (info, attachid);
g_free (attachid);
@@ -2484,7 +2484,7 @@ tzid_cb (ICalParameter *param,
if (!new_comp)
return;
- i_cal_component_take_component (cbd->comp, i_cal_component_new_clone (new_comp));
+ i_cal_component_take_component (cbd->comp, i_cal_component_clone (new_comp));
g_object_unref (new_comp);
}
@@ -2521,7 +2521,7 @@ ecb_ews_modify_item_sync (ECalBackendEws *cbews,
g_return_val_if_fail (E_IS_CAL_BACKEND_EWS (cbews), FALSE);
g_return_val_if_fail (I_CAL_IS_COMPONENT (new_icomp), FALSE);
- icomp = i_cal_component_new_clone (new_icomp);
+ icomp = i_cal_component_clone (new_icomp);
ecb_ews_pick_all_tzids_out (cbews, icomp);
@@ -2539,9 +2539,9 @@ ecb_ews_modify_item_sync (ECalBackendEws *cbews,
}
if (old_icomp) {
- oldcomp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (old_icomp));
+ oldcomp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (old_icomp));
} else {
- oldcomp = e_cal_component_new_from_icalcomponent (i_cal_component_new_clone (new_icomp));
+ oldcomp = e_cal_component_new_from_icalcomponent (i_cal_component_clone (new_icomp));
}
ecb_ews_pick_all_tzids_out (cbews, e_cal_component_get_icalcomponent (oldcomp));
@@ -2595,12 +2595,12 @@ ecb_ews_modify_item_sync (ECalBackendEws *cbews,
g_object_unref (prop), prop = i_cal_component_get_next_property (new_icomp,
I_CAL_EXDATE_PROPERTY)) {
gchar *new_rid;
- new_rid = i_cal_property_get_value_as_string_r (prop);
+ new_rid = i_cal_property_get_value_as_string (prop);
for (old_prop = i_cal_component_get_first_property (old_icomp, I_CAL_EXDATE_PROPERTY);
old_prop;
g_object_unref (old_prop), old_prop = i_cal_component_get_next_property
(old_icomp, I_CAL_EXDATE_PROPERTY)) {
- gchar *old_rid = i_cal_property_get_value_as_string_r (old_prop);
+ gchar *old_rid = i_cal_property_get_value_as_string (old_prop);
if (g_strcmp0 (new_rid, old_rid) == 0) {
g_object_unref (old_prop);
g_free (old_rid);
@@ -2624,7 +2624,7 @@ ecb_ews_modify_item_sync (ECalBackendEws *cbews,
prop = link->data;
- rid = i_cal_property_get_value_as_string_r (prop);
+ rid = i_cal_property_get_value_as_string (prop);
index = e_cal_backend_ews_rid_to_index (
ecb_ews_get_timezone_from_icomponent (cbews, new_icomp),
rid,
@@ -2829,7 +2829,7 @@ ecb_ews_save_component_sync (ECalMetaBackend *meta_backend,
ICalProperty *prop;
GSList *items = NULL;
- icomp = i_cal_component_new_clone (e_cal_component_get_icalcomponent (master));
+ icomp = i_cal_component_clone (e_cal_component_get_icalcomponent (master));
e_ews_clean_icomponent (icomp);
@@ -2943,7 +2943,7 @@ ecb_ews_save_component_sync (ECalMetaBackend *meta_backend,
for (prop = i_cal_component_get_first_property (icomp, I_CAL_EXDATE_PROPERTY);
prop;
g_object_unref (prop), prop = i_cal_component_get_next_property (icomp,
I_CAL_EXDATE_PROPERTY)) {
- exceptions = g_slist_prepend (exceptions,
i_cal_property_get_value_as_string_r (prop));
+ exceptions = g_slist_prepend (exceptions, i_cal_property_get_value_as_string
(prop));
}
for (link = exceptions; link && success; link = g_slist_next (link)) {
@@ -3188,7 +3188,7 @@ ecb_ews_send_cancellation_email_sync (ECalBackendEws *cbews,
if (icaltz) {
vtz = i_cal_timezone_get_component (icaltz);
if (vtz)
- i_cal_component_take_component (vcal, i_cal_component_new_clone (vtz));
+ i_cal_component_take_component (vcal, i_cal_component_clone (vtz));
g_clear_object (&vtz);
}
@@ -3203,7 +3203,7 @@ ecb_ews_send_cancellation_email_sync (ECalBackendEws *cbews,
mime_type = camel_data_wrapper_get_mime_type_field (CAMEL_DATA_WRAPPER (vcal_part));
camel_content_type_set_param (mime_type, "charset", "utf-8");
camel_content_type_set_param (mime_type, "method", "CANCEL");
- ical_str = i_cal_component_as_ical_string_r (vcal);
+ ical_str = i_cal_component_as_ical_string (vcal);
camel_mime_part_set_content (vcal_part, ical_str, strlen (ical_str), "text/calendar; method=CANCEL");
g_free (ical_str);
@@ -3280,7 +3280,7 @@ find_attendee (ICalComponent *icomp,
gchar *attendee;
gchar *text;
- attendee = i_cal_property_get_value_as_string_r (prop);
+ attendee = i_cal_property_get_value_as_string (prop);
if (!attendee)
continue;
@@ -3403,7 +3403,7 @@ ecb_ews_get_current_user_meeting_reponse (ECalBackendEws *cbews,
if (attendee_mail && current_user_mail && g_ascii_strcasecmp (attendee_mail,
current_user_mail) == 0) {
g_free (response);
- response = i_cal_property_get_parameter_as_string_r (attendee, "PARTSTAT");
+ response = i_cal_property_get_parameter_as_string (attendee, "PARTSTAT");
ecb_ews_get_rsvp (attendee, out_rsvp_requested);
found = TRUE;
}
@@ -3416,7 +3416,7 @@ ecb_ews_get_current_user_meeting_reponse (ECalBackendEws *cbews,
attendee = i_cal_component_get_first_property (icomp, I_CAL_ATTENDEE_PROPERTY);
g_return_val_if_fail (attendee != NULL, NULL);
- response = i_cal_property_get_parameter_as_string_r (attendee, "PARTSTAT");
+ response = i_cal_property_get_parameter_as_string (attendee, "PARTSTAT");
ecb_ews_get_rsvp (attendee, out_rsvp_requested);
found = TRUE;
g_clear_object (&attendee);
@@ -3425,7 +3425,7 @@ ecb_ews_get_current_user_meeting_reponse (ECalBackendEws *cbews,
ECalComponent *comp;
registry = e_cal_backend_get_registry (E_CAL_BACKEND (cbews));
- 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) {
gchar *my_address;
@@ -3436,7 +3436,7 @@ ecb_ews_get_current_user_meeting_reponse (ECalBackendEws *cbews,
attendee = find_attendee_if_sentby (icomp, my_address);
if (attendee) {
- response = i_cal_property_get_parameter_as_string_r (attendee, "PARTSTAT");
+ response = i_cal_property_get_parameter_as_string (attendee, "PARTSTAT");
ecb_ews_get_rsvp (attendee, out_rsvp_requested);
found = TRUE;
g_clear_object (&attendee);
@@ -3729,7 +3729,7 @@ ecb_ews_receive_objects_sync (ECalBackendSync *sync_backend,
/* getting a data for meeting request response */
response_type = ecb_ews_get_current_user_meeting_reponse (cbews, subcomp, user_email,
&rsvp_requested);
- 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));
success = ecb_ews_do_method_request_publish_reply (cbews, icomp, comp, subcomp,
response_type, user_email, rsvp_requested, cancellable, error);
@@ -3894,7 +3894,7 @@ ecb_ews_send_objects_sync (ECalBackendSync *sync_backend,
org_prop = i_cal_component_get_first_property (subcomp, I_CAL_ORGANIZER_PROPERTY);
org = i_cal_property_get_organizer (org_prop);
org_email = itip_strip_mailto (org);
- org_cn = i_cal_property_get_parameter_as_string_r (org_prop, "CN");
+ org_cn = i_cal_property_get_parameter_as_string (org_prop, "CN");
camel_internet_address_add (org_addr, org_cn, org_email);
@@ -3909,8 +3909,8 @@ ecb_ews_send_objects_sync (ECalBackendSync *sync_backend,
if (!attendee || g_ascii_strcasecmp (org_email, attendee) == 0)
continue;
- subcalobj = i_cal_component_as_ical_string_r (subcomp);
- att_cn = i_cal_property_get_parameter_as_string_r (prop, "CN");
+ subcalobj = i_cal_component_as_ical_string (subcomp);
+ att_cn = i_cal_property_get_parameter_as_string (prop, "CN");
camel_internet_address_add (attendee_addr, att_cn, attendee);
@@ -3991,7 +3991,7 @@ ecb_ews_get_free_busy_sync (ECalBackendSync *sync_backend,
i_cal_component_take_property (icomp, i_cal_property_new_attendee (mailto));
g_free (mailto);
- *freebusyobjs = g_slist_prepend (*freebusyobjs, i_cal_component_as_ical_string_r
(icomp));
+ *freebusyobjs = g_slist_prepend (*freebusyobjs, i_cal_component_as_ical_string
(icomp));
}
*freebusyobjs = g_slist_reverse (*freebusyobjs);
diff --git a/src/camel/camel-ews-folder.c b/src/camel/camel-ews-folder.c
index e17b7a9a..7fdafd18 100644
--- a/src/camel/camel-ews-folder.c
+++ b/src/camel/camel-ews-folder.c
@@ -436,7 +436,7 @@ ews_update_mgtrequest_mime_calendar_itemid (const gchar *mime_fname,
i_cal_property_set_x_name (prop, "X-EVOLUTION-ACCEPT-ID");
i_cal_component_take_property (subcomp, prop);
- calstring_new = i_cal_component_as_ical_string_r (icomp);
+ calstring_new = i_cal_component_as_ical_string (icomp);
if (calstring_new) {
camel_mime_part_set_content (
mimepart,
diff --git a/src/server/e-ews-calendar-utils.c b/src/server/e-ews-calendar-utils.c
index 2eeb0108..5e14775b 100644
--- a/src/server/e-ews-calendar-utils.c
+++ b/src/server/e-ews-calendar-utils.c
@@ -394,8 +394,8 @@ e_ews_cal_utils_prepare_free_busy_request (ESoapMessage *msg,
e_soap_message_start_element (msg, "FreeBusyViewOptions", NULL, NULL);
- t_start = i_cal_time_from_timet_with_zone (fbdata->period_start, 0, utc_zone);
- t_end = i_cal_time_from_timet_with_zone (fbdata->period_end, 0, utc_zone);
+ t_start = i_cal_time_new_from_timet_with_zone (fbdata->period_start, 0, utc_zone);
+ t_end = i_cal_time_new_from_timet_with_zone (fbdata->period_end, 0, utc_zone);
e_soap_message_start_element (msg, "TimeWindow", NULL, NULL);
e_ews_cal_utils_set_time (msg, "StartTime", t_start, FALSE);
@@ -453,7 +453,7 @@ e_ews_cal_utils_set_time (ESoapMessage *msg,
ICalTimezone *cfg_zone;
cfg_zone = calendar_config_get_icaltimezone ();
- local_tt = i_cal_time_from_timet_with_zone (i_cal_time_as_timet_with_zone (tt, cfg_zone),
FALSE, i_cal_timezone_get_utc_timezone ());
+ local_tt = i_cal_time_new_from_timet_with_zone (i_cal_time_as_timet_with_zone (tt, cfg_zone),
FALSE, i_cal_timezone_get_utc_timezone ());
tt = local_tt;
}
@@ -1389,7 +1389,7 @@ e_ews_cal_util_write_utc_date (ESoapMessage *msg,
g_return_if_fail (E_IS_SOAP_MESSAGE (msg));
g_return_if_fail (name != NULL);
- itt = i_cal_time_from_timet_with_zone (utc_date, 1, i_cal_timezone_get_utc_timezone ());
+ itt = i_cal_time_new_from_timet_with_zone (utc_date, 1, i_cal_timezone_get_utc_timezone ());
value = g_strdup_printf ("%04d-%02d-%02dZ",
i_cal_time_get_year (itt),
i_cal_time_get_month (itt),
@@ -1688,27 +1688,27 @@ e_ews_cal_utils_recurrence_to_rrule (EEwsItem *item,
return;
rrule = i_cal_recurrence_new ();
- recur_start = i_cal_time_from_timet_with_zone (recur.utc_start_date, 1,
i_cal_timezone_get_utc_timezone ());
+ recur_start = i_cal_time_new_from_timet_with_zone (recur.utc_start_date, 1,
i_cal_timezone_get_utc_timezone ());
switch (recur.end_type) {
case E_EWS_RECURRENCE_END_UNKNOWN:
break;
case E_EWS_RECURRENCE_END_NO_END:
- itt = i_cal_time_null_time ();
+ itt = i_cal_time_new_null_time ();
i_cal_recurrence_set_until (rrule, itt);
i_cal_recurrence_set_count (rrule, 0);
g_clear_object (&itt);
usable = TRUE;
break;
case E_EWS_RECURRENCE_END_DATE:
- itt = i_cal_time_from_timet_with_zone (recur.end.utc_end_date, 1,
i_cal_timezone_get_utc_timezone ());
+ itt = i_cal_time_new_from_timet_with_zone (recur.end.utc_end_date, 1,
i_cal_timezone_get_utc_timezone ());
i_cal_recurrence_set_until (rrule, itt);
i_cal_recurrence_set_count (rrule, 0);
usable = !i_cal_time_is_null_time (itt) && i_cal_time_is_valid_time (itt);
g_clear_object (&itt);
break;
case E_EWS_RECURRENCE_END_NUMBERED:
- itt = i_cal_time_null_time ();
+ itt = i_cal_time_new_null_time ();
i_cal_recurrence_set_until (rrule, itt);
i_cal_recurrence_set_count (rrule, recur.end.number_of_occurrences);
g_clear_object (&itt);
diff --git a/src/server/e-ews-connection.c b/src/server/e-ews-connection.c
index 143c9013..c3f06488 100644
--- a/src/server/e-ews-connection.c
+++ b/src/server/e-ews-connection.c
@@ -8047,7 +8047,7 @@ ews_handle_free_busy_view (ESoapParameter *param,
event_param = e_soap_parameter_get_next_child (event_param)) {
ICalPeriod *ipt;
- ipt = i_cal_period_null_period ();
+ ipt = i_cal_period_new_null_period ();
for (subparam = e_soap_parameter_get_first_child (event_param); subparam != NULL; subparam =
e_soap_parameter_get_next_child (subparam)) {
name = e_soap_parameter_get_name (subparam);
@@ -8071,7 +8071,7 @@ ews_handle_free_busy_view (ESoapParameter *param,
g_time_val_from_iso8601 (new_val, &t_val);
g_free (new_val);
- itt = i_cal_time_from_timet_with_zone (t_val.tv_sec, 0, NULL);
+ itt = i_cal_time_new_from_timet_with_zone (t_val.tv_sec, 0, NULL);
i_cal_period_set_start (ipt, itt);
g_clear_object (&itt);
@@ -8094,7 +8094,7 @@ ews_handle_free_busy_view (ESoapParameter *param,
g_time_val_from_iso8601 (new_val, &t_val);
g_free (new_val);
- itt = i_cal_time_from_timet_with_zone (t_val.tv_sec, 0, NULL);
+ itt = i_cal_time_new_from_timet_with_zone (t_val.tv_sec, 0, NULL);
i_cal_period_set_end (ipt, itt);
g_clear_object (&itt);
diff --git a/src/server/e-ews-item.c b/src/server/e-ews-item.c
index d702e45d..a2df1bd5 100644
--- a/src/server/e-ews-item.c
+++ b/src/server/e-ews-item.c
@@ -402,7 +402,7 @@ ews_item_parse_date (ESoapParameter *param)
if (len == 11) {
ICalTime *itt;
- itt = i_cal_time_null_time ();
+ itt = i_cal_time_new_null_time ();
i_cal_time_set_date (itt, year, month, day);
i_cal_time_set_timezone (itt, i_cal_timezone_get_utc_timezone ());
i_cal_time_set_is_date (itt, TRUE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
