[evolution-mapi/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-mapi/wip/mcrha/eds-libical-glib] Adapt to the latest libical-glib API changes
- Date: Thu, 2 May 2019 11:49:30 +0000 (UTC)
commit c4b6447625ad2058c77aa63e56b5370389883cd2
Author: Milan Crha <mcrha redhat com>
Date: Thu May 2 13:51:20 2019 +0200
Adapt to the latest libical-glib API changes
src/calendar/e-cal-backend-mapi.c | 18 ++++++-------
src/libexchangemapi/e-mapi-cal-recur-utils.c | 14 +++++-----
src/libexchangemapi/e-mapi-cal-tz-utils.c | 8 +++---
src/libexchangemapi/e-mapi-cal-utils.c | 40 ++++++++++++++--------------
src/libexchangemapi/e-mapi-mail-utils.c | 8 +++---
5 files changed, 44 insertions(+), 44 deletions(-)
---
diff --git a/src/calendar/e-cal-backend-mapi.c b/src/calendar/e-cal-backend-mapi.c
index e765688..3d4f680 100644
--- a/src/calendar/e-cal-backend-mapi.c
+++ b/src/calendar/e-cal-backend-mapi.c
@@ -318,7 +318,7 @@ ecb_mapi_build_global_id_restriction (EMapiConnection *conn,
dtstamp = e_cal_component_get_dtstamp (comp);
if (!dtstamp)
- dtstamp = i_cal_time_null_time ();
+ dtstamp = i_cal_time_new_null_time ();
e_mapi_util_time_t_to_filetime (i_cal_time_as_timet (dtstamp), &creation_time);
e_mapi_cal_util_generate_globalobjectid (FALSE, uid, NULL, (dtstamp && i_cal_time_get_year
(dtstamp)) ? &creation_time : NULL, &sb);
@@ -999,7 +999,7 @@ ecb_mapi_preload_infos_sync (ECalBackendMAPI *cbmapi,
nfo = g_hash_table_lookup (infos, xmid);
if (nfo && !nfo->object)
- nfo->object = i_cal_component_as_ical_string_r (icomp);
+ nfo->object = i_cal_component_as_ical_string (icomp);
g_free (xmid);
}
@@ -1071,8 +1071,8 @@ ecb_mapi_list_existing_uids_cb (EMapiConnection *conn,
ICalTime *itt;
gchar *rev;
- itt = i_cal_time_from_timet_with_zone (object_data->last_modified, 0,
i_cal_timezone_get_utc_timezone ());
- rev = i_cal_time_as_ical_string_r (itt);
+ itt = i_cal_time_new_from_timet_with_zone (object_data->last_modified, 0,
i_cal_timezone_get_utc_timezone ());
+ rev = i_cal_time_as_ical_string (itt);
g_clear_object (&itt);
*out_existing_objects = g_slist_prepend (*out_existing_objects,
@@ -1288,7 +1288,7 @@ ecb_mapi_save_component_sync (ECalMetaBackend *meta_backend,
cbmapi = E_CAL_BACKEND_MAPI (meta_backend);
- icomp = i_cal_component_new_clone (e_cal_component_get_icalcomponent (instances->data));
+ icomp = i_cal_component_clone (e_cal_component_get_icalcomponent (instances->data));
no_increment = e_cal_util_component_remove_x_property (icomp, "X-EVOLUTION-IS-REPLY");
comp = e_cal_component_new_from_icalcomponent (icomp);
@@ -1552,7 +1552,7 @@ ecb_mapi_send_objects_sync (ECalBackendSync *sync_backend,
ICalTime *dtstamp;
mapi_object_t obj_folder;
- 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)
continue;
@@ -1595,7 +1595,7 @@ ecb_mapi_send_objects_sync (ECalBackendSync *sync_backend,
dtstamp = e_cal_component_get_dtstamp (comp);
if (!dtstamp)
- dtstamp = i_cal_time_null_time ();
+ dtstamp = i_cal_time_new_null_time ();
e_mapi_util_time_t_to_filetime (i_cal_time_as_timet (dtstamp), &creation_time);
propval = e_cal_util_component_dup_x_property (e_cal_component_get_icalcomponent
(comp), "X-EVOLUTION-MAPI-EXREPTIME");
@@ -1830,7 +1830,7 @@ ecb_mapi_update_tzid_cb (ECache *cache,
g_clear_object (&prop);
if (changed)
- *out_object = i_cal_component_as_ical_string_r (icomp);
+ *out_object = i_cal_component_as_ical_string (icomp);
g_object_unref (icomp);
@@ -1864,7 +1864,7 @@ ecb_mapi_dup_component_revision_cb (ECalCache *cal_cache,
return NULL;
itt = i_cal_property_get_lastmodified (prop);
- res = i_cal_time_as_ical_string_r (itt);
+ res = i_cal_time_as_ical_string (itt);
g_clear_object (&prop);
g_clear_object (&itt);
diff --git a/src/libexchangemapi/e-mapi-cal-recur-utils.c b/src/libexchangemapi/e-mapi-cal-recur-utils.c
index e62dba7..6dab808 100644
--- a/src/libexchangemapi/e-mapi-cal-recur-utils.c
+++ b/src/libexchangemapi/e-mapi-cal-recur-utils.c
@@ -942,7 +942,7 @@ e_mapi_cal_util_bin_to_rrule (const guint8 *lpb,
ICalTime *tt;
time_t ictime = convert_recurrence_minutes_to_timet (rp->DeletedInstanceDates[i]);
- tt = i_cal_time_from_timet_with_zone (ictime, 1, NULL);
+ tt = i_cal_time_new_from_timet_with_zone (ictime, 1, NULL);
exdate_list = g_slist_append (exdate_list, e_cal_component_datetime_new_take (tt,
g_strdup ("UTC")));
}
@@ -954,7 +954,7 @@ e_mapi_cal_util_bin_to_rrule (const guint8 *lpb,
time_t ict = convert_recurrence_minutes_to_timet (rp->EndDate);
- itt = i_cal_time_from_timet_with_zone (ict, 1, NULL);
+ itt = i_cal_time_new_from_timet_with_zone (ict, 1, NULL);
i_cal_recurrence_set_until (rt, itt);
g_clear_object (&itt);
}
@@ -989,18 +989,18 @@ e_mapi_cal_util_bin_to_rrule (const guint8 *lpb,
/* make a shallow clone of comp */
detached[i] = e_cal_component_clone (comp);
- tt = i_cal_time_from_timet_with_zone (convert_recurrence_minutes_to_timet
(ei->OriginalStartDate), 0, NULL);
+ tt = i_cal_time_new_from_timet_with_zone (convert_recurrence_minutes_to_timet
(ei->OriginalStartDate), 0, NULL);
rid = e_cal_component_range_new_take (E_CAL_COMPONENT_RANGE_SINGLE,
e_cal_component_datetime_new_take (tt, g_strdup (recur_zone ?
i_cal_timezone_get_tzid (recur_zone) : "UTC")));
e_cal_component_set_recurid (detached[i], rid);
e_cal_component_range_free (rid);
- tt = i_cal_time_from_timet_with_zone (convert_recurrence_minutes_to_timet
(ei->StartDateTime), 0, NULL);
+ tt = i_cal_time_new_from_timet_with_zone (convert_recurrence_minutes_to_timet
(ei->StartDateTime), 0, NULL);
edt = e_cal_component_datetime_new_take (tt, g_strdup (recur_zone ?
i_cal_timezone_get_tzid (recur_zone) : "UTC"));
e_cal_component_set_dtstart (detached[i], edt);
e_cal_component_datetime_free (edt);
- tt = i_cal_time_from_timet_with_zone (convert_recurrence_minutes_to_timet
(ei->EndDateTime), 0, NULL);
+ tt = i_cal_time_new_from_timet_with_zone (convert_recurrence_minutes_to_timet
(ei->EndDateTime), 0, NULL);
edt = e_cal_component_datetime_new_take (tt, g_strdup (recur_zone ?
i_cal_timezone_get_tzid (recur_zone) : "UTC"));
e_cal_component_set_dtend (detached[i], edt);
e_cal_component_datetime_free (edt);
@@ -1193,7 +1193,7 @@ calculate_no_of_occurrences (ECalComponent *comp,
break;
g_clear_object (&prev);
- prev = i_cal_time_new_clone (next);
+ prev = i_cal_time_clone (next);
count++;
}
@@ -1430,7 +1430,7 @@ e_mapi_cal_util_rrule_to_bin (ECalComponent *comp,
else if (rp->EndType == END_AFTER_N_OCCURRENCES) {
ECalComponentDateTime *dtstart;
ICalTime *itt;
- gchar *rrule_str = i_cal_recurrence_as_string_r (rt);
+ gchar *rrule_str = i_cal_recurrence_to_string (rt);
GArray *array;
dtstart = e_cal_component_get_dtstart (comp);
diff --git a/src/libexchangemapi/e-mapi-cal-tz-utils.c b/src/libexchangemapi/e-mapi-cal-tz-utils.c
index 25fb0da..c74d980 100644
--- a/src/libexchangemapi/e-mapi-cal-tz-utils.c
+++ b/src/libexchangemapi/e-mapi-cal-tz-utils.c
@@ -85,7 +85,7 @@ e_mapi_tm_to_icaltime (struct tm *tm,
{
ICalTime *itt;
- itt = i_cal_time_null_time ();
+ itt = i_cal_time_new_null_time ();
i_cal_time_set_time (itt, 0, 0, 0);
i_cal_time_set_date (itt, tm->tm_year + 1900, dst ? 6 : 1, 1);
i_cal_time_set_timezone (itt, NULL);
@@ -512,7 +512,7 @@ write_tz_rule_comps (GByteArray *ba,
extract_bias_and_date (standardcomp, &standard_bias, &standard_date);
extract_bias_and_date (daylightcomp, &daylight_bias, &daylight_date);
- current_time = i_cal_time_current_time_with_zone (zone);
+ current_time = i_cal_time_new_current_with_zone (zone);
bias = i_cal_time_is_daylight (current_time) ? daylight_bias : standard_bias;
write_tz_rule (ba, is_recur, bias, standard_bias, daylight_bias, standard_date, daylight_date);
@@ -566,7 +566,7 @@ add_timezone_rules (GByteArray *ba,
if (!any_added) {
ICalTime *fake_utc;
- fake_utc = i_cal_time_null_time ();
+ fake_utc = i_cal_time_new_null_time ();
write_tz_rule (ba, is_recur, 0, 0, 0, fake_utc, fake_utc);
@@ -845,7 +845,7 @@ e_mapi_cal_util_mapi_tz_pidlidtimezone (ICalTimezone *ictz)
tz_has_dst = TRUE;
/* Calculate minutes east of UTC, what MS uses in this spec */
- tt = i_cal_time_current_time_with_zone (ictz);
+ tt = i_cal_time_new_current_with_zone (ictz);
utc_offset = i_cal_timezone_get_utc_offset (ictz, tt, &tz_dst_now) / 60;
if (tz_dst_now)
utc_offset -= 60;
diff --git a/src/libexchangemapi/e-mapi-cal-utils.c b/src/libexchangemapi/e-mapi-cal-utils.c
index 5f82cc7..f742821 100644
--- a/src/libexchangemapi/e-mapi-cal-utils.c
+++ b/src/libexchangemapi/e-mapi-cal-utils.c
@@ -262,7 +262,7 @@ e_mapi_cal_util_generate_globalobjectid (gboolean is_clean,
val32 = 0;
if (!is_clean && exception_replace_time) {
- ICalTime *itt = i_cal_time_from_timet_with_zone (exception_replace_time->tv_sec, 0,
i_cal_timezone_get_utc_timezone ());
+ ICalTime *itt = i_cal_time_new_from_timet_with_zone (exception_replace_time->tv_sec, 0,
i_cal_timezone_get_utc_timezone ());
val32 |= (i_cal_time_get_year (itt) & 0xFF00) << 16;
val32 |= (i_cal_time_get_year (itt) & 0xFF) << 16;
@@ -538,13 +538,13 @@ populate_freebusy_data (struct Binary_r *bin,
start_date = mapi_get_date_from_string (start) + (60 * event_start);
end_date = mapi_get_date_from_string (end) + (60 * event_end);
- period = i_cal_period_null_period ();
+ period = i_cal_period_new_null_period ();
- itt = i_cal_time_from_timet_with_zone (start_date, 0, i_cal_timezone_get_utc_timezone
());
+ itt = i_cal_time_new_from_timet_with_zone (start_date, 0,
i_cal_timezone_get_utc_timezone ());
i_cal_period_set_start (period, itt);
g_clear_object (&itt);
- itt = i_cal_time_from_timet_with_zone (end_date, 0, i_cal_timezone_get_utc_timezone
());
+ itt = i_cal_time_new_from_timet_with_zone (end_date, 0,
i_cal_timezone_get_utc_timezone ());
i_cal_period_set_end (period, itt);
g_clear_object (&itt);
@@ -638,8 +638,8 @@ e_mapi_cal_utils_get_free_busy_data (EMapiConnection *conn,
e_cal_component_commit_sequence (comp);
icomp = e_cal_component_get_icalcomponent (comp);
- starttt = i_cal_time_from_timet_with_zone (start, 0, NULL);
- endtt = i_cal_time_from_timet_with_zone (end, 0, NULL);
+ starttt = i_cal_time_new_from_timet_with_zone (start, 0, NULL);
+ endtt = i_cal_time_new_from_timet_with_zone (end, 0, NULL);
i_cal_component_set_dtstart (icomp, starttt);
i_cal_component_set_dtend (icomp, endtt);
g_clear_object (&starttt);
@@ -952,7 +952,7 @@ e_mapi_cal_util_object_to_comp (EMapiConnection *conn,
/* set dtstamp - in UTC */
if (e_mapi_util_find_array_datetime_propval (&t, &object->properties, PidTagCreationTime) ==
MAPI_E_SUCCESS) {
- itt = i_cal_time_from_timet_with_zone (t.tv_sec, 0, utc_zone);
+ itt = i_cal_time_new_from_timet_with_zone (t.tv_sec, 0, utc_zone);
i_cal_component_set_dtstamp (icomp, itt);
prop = i_cal_property_new_created (itt);
@@ -961,7 +961,7 @@ e_mapi_cal_util_object_to_comp (EMapiConnection *conn,
g_clear_object (&itt);
} else {
/* created - in UTC */
- itt = i_cal_time_current_time_with_zone (utc_zone);
+ itt = i_cal_time_new_current_with_zone (utc_zone);
prop = i_cal_property_new_created (itt);
i_cal_component_take_property (icomp, prop);
g_clear_object (&itt);
@@ -969,7 +969,7 @@ e_mapi_cal_util_object_to_comp (EMapiConnection *conn,
/* last modified - in UTC */
if (get_mapi_SPropValue_array_date_timeval (&t, &object->properties, PidTagLastModificationTime) ==
MAPI_E_SUCCESS) {
- itt = i_cal_time_from_timet_with_zone (t.tv_sec, 0, utc_zone);
+ itt = i_cal_time_new_from_timet_with_zone (t.tv_sec, 0, utc_zone);
prop = i_cal_property_new_lastmodified (itt);
i_cal_component_take_property (icomp, prop);
g_clear_object (&itt);
@@ -1058,7 +1058,7 @@ e_mapi_cal_util_object_to_comp (EMapiConnection *conn,
if (e_mapi_util_find_array_datetime_propval (&t, &object->properties,
PidLidAppointmentStartWhole) == MAPI_E_SUCCESS) {
ICalTimezone *zone = dtstart_tz_location ? i_cal_timezone_get_builtin_timezone
(dtstart_tz_location) : utc_zone;
- itt = i_cal_time_from_timet_with_zone (t.tv_sec, all_day, zone);
+ itt = i_cal_time_new_from_timet_with_zone (t.tv_sec, all_day, zone);
i_cal_time_set_timezone (itt, zone);
prop = i_cal_property_new_dtstart (itt);
if (!all_day && zone && i_cal_timezone_get_tzid (zone)) {
@@ -1090,7 +1090,7 @@ e_mapi_cal_util_object_to_comp (EMapiConnection *conn,
dtend_tz_location = dtstart_tz_location;
zone = dtend_tz_location ? i_cal_timezone_get_builtin_timezone (dtend_tz_location) :
utc_zone;
- itt = i_cal_time_from_timet_with_zone (t.tv_sec, all_day, zone);
+ itt = i_cal_time_new_from_timet_with_zone (t.tv_sec, all_day, zone);
i_cal_time_set_timezone (itt, zone);
prop = i_cal_property_new_dtend (itt);
if (!all_day && zone && i_cal_timezone_get_tzid (zone)) {
@@ -1247,8 +1247,8 @@ e_mapi_cal_util_object_to_comp (EMapiConnection *conn,
ICalDuration *duration;
ICalTime *itt1, *itt2;
- itt1 = i_cal_time_from_timet_with_zone (displaytime.tv_sec, 0, NULL);
- itt2 = i_cal_time_from_timet_with_zone (start.tv_sec, 0, NULL);
+ itt1 = i_cal_time_new_from_timet_with_zone (displaytime.tv_sec, 0, NULL);
+ itt2 = i_cal_time_new_from_timet_with_zone (start.tv_sec, 0, NULL);
duration = i_cal_time_subtract (itt1, itt2);
g_clear_object (&itt1);
g_clear_object (&itt2);
@@ -1271,13 +1271,13 @@ e_mapi_cal_util_object_to_comp (EMapiConnection *conn,
/* NOTE: Exchange tasks are DATE values, not DATE-TIME values, but maybe someday, we could
expect Exchange to support it;) */
if (e_mapi_util_find_array_datetime_propval (&t, &object->properties, PidLidTaskStartDate) ==
MAPI_E_SUCCESS) {
- itt = i_cal_time_from_timet_with_zone (t.tv_sec, 1, utc_zone);
+ itt = i_cal_time_new_from_timet_with_zone (t.tv_sec, 1, utc_zone);
i_cal_component_set_dtstart (icomp, itt);
g_clear_object (&itt);
}
if (e_mapi_util_find_array_datetime_propval (&t, &object->properties, PidLidTaskDueDate) ==
MAPI_E_SUCCESS) {
- itt = i_cal_time_from_timet_with_zone (t.tv_sec, 1, utc_zone);
+ itt = i_cal_time_new_from_timet_with_zone (t.tv_sec, 1, utc_zone);
i_cal_component_set_due (icomp, itt);
g_clear_object (&itt);
}
@@ -1287,7 +1287,7 @@ e_mapi_cal_util_object_to_comp (EMapiConnection *conn,
i_cal_component_set_status (icomp, get_taskstatus_from_prop (*status));
if (*status == olTaskComplete
&& e_mapi_util_find_array_datetime_propval (&t, &object->properties,
PidLidTaskDateCompleted) == MAPI_E_SUCCESS) {
- itt = i_cal_time_from_timet_with_zone (t.tv_sec, 0, utc_zone);
+ itt = i_cal_time_new_from_timet_with_zone (t.tv_sec, 0, utc_zone);
prop = i_cal_property_new_completed (itt);
i_cal_component_take_property (icomp, prop);
g_clear_object (&itt);
@@ -1314,7 +1314,7 @@ e_mapi_cal_util_object_to_comp (EMapiConnection *conn,
ECalComponentAlarmTrigger *trigger;
ICalTime *abs_time;
- abs_time = i_cal_time_from_timet_with_zone (abs.tv_sec, 0, utc_zone);
+ abs_time = i_cal_time_new_from_timet_with_zone (abs.tv_sec, 0, utc_zone);
trigger = e_cal_component_alarm_trigger_new_absolute (abs_time);
g_clear_object (&abs_time);
@@ -1329,7 +1329,7 @@ e_mapi_cal_util_object_to_comp (EMapiConnection *conn,
} else if (i_cal_component_isa (icomp) == I_CAL_VJOURNAL_COMPONENT) {
if (e_mapi_util_find_array_datetime_propval (&t, &object->properties,
PidTagLastModificationTime) == MAPI_E_SUCCESS) {
- itt = i_cal_time_from_timet_with_zone (t.tv_sec, 1, utc_zone);
+ itt = i_cal_time_new_from_timet_with_zone (t.tv_sec, 1, utc_zone);
i_cal_component_set_dtstart (icomp, itt);
g_clear_object (&itt);
}
@@ -2128,7 +2128,7 @@ e_mapi_cal_utils_comp_to_object (EMapiConnection *conn,
b = 1;
set_value (PidLidFInvited, &b);
- itt = i_cal_time_current_time_with_zone (utc_zone);
+ itt = i_cal_time_new_current_with_zone (utc_zone);
tt = i_cal_time_as_timet (itt);
set_timet_value (PidLidAttendeeCriticalChange, tt);
g_clear_object (&itt);
@@ -2224,7 +2224,7 @@ e_mapi_cal_utils_comp_to_object (EMapiConnection *conn,
flag32 = mtgEmpty;
set_value (PidLidMeetingType, &flag32);
- itt = i_cal_time_current_time_with_zone (utc_zone);
+ itt = i_cal_time_new_current_with_zone (utc_zone);
tt = i_cal_time_as_timet (itt);
set_timet_value (PidLidAppointmentReplyTime, tt);
g_clear_object (&itt);
diff --git a/src/libexchangemapi/e-mapi-mail-utils.c b/src/libexchangemapi/e-mapi-mail-utils.c
index 2f9153e..379fafc 100644
--- a/src/libexchangemapi/e-mapi-mail-utils.c
+++ b/src/libexchangemapi/e-mapi-mail-utils.c
@@ -308,7 +308,7 @@ add_timezones_cb (ICalParameter *param,
if (!vtimezone_comp)
return;
- i_cal_component_take_component (tz_data->icomp, i_cal_component_new_clone (vtimezone_comp));
+ i_cal_component_take_component (tz_data->icomp, i_cal_component_clone (vtimezone_comp));
g_hash_table_insert (tz_data->tzids, g_strdup (tzid), GINT_TO_POINTER (1));
}
@@ -369,7 +369,7 @@ build_ical_string (EMapiConnection *conn,
ForeachTZIDData tz_data;
ICalComponent *clone;
- clone = i_cal_component_new_clone (e_cal_component_get_icalcomponent (comp));
+ clone = i_cal_component_clone (e_cal_component_get_icalcomponent (comp));
icomp = e_cal_util_new_top_level ();
if (method != I_CAL_METHOD_NONE)
@@ -387,10 +387,10 @@ build_ical_string (EMapiConnection *conn,
i_cal_component_take_component (icomp, clone);
for (iter = detached_components; iter; iter = g_slist_next (iter)) {
i_cal_component_take_component (icomp,
- i_cal_component_new_clone (e_cal_component_get_icalcomponent (iter->data)));
+ i_cal_component_clone (e_cal_component_get_icalcomponent (iter->data)));
}
- ical_string = i_cal_component_as_ical_string_r (icomp);
+ ical_string = i_cal_component_as_ical_string (icomp);
g_object_unref (icomp);
} else {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
