diff options
author | jperkin <jperkin@pkgsrc.org> | 2018-05-16 16:15:23 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2018-05-16 16:15:23 +0000 |
commit | 4157e7e3bef82e100d5a7d765885086b852ee45c (patch) | |
tree | c03431985e9e809032a44567cd0d37834e72b5ef | |
parent | c2f61f4f69473b97ee770fab9d4285aa64abdf77 (diff) | |
download | pkgsrc-4157e7e3bef82e100d5a7d765885086b852ee45c.tar.gz |
evolution: Fix build against current libical API.
15 files changed, 330 insertions, 10 deletions
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo index d4a4226b68b..fd7ffdb00f4 100644 --- a/mail/evolution/distinfo +++ b/mail/evolution/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.84 2015/11/03 23:27:04 agc Exp $ +$NetBSD: distinfo,v 1.85 2018/05/16 16:15:23 jperkin Exp $ SHA1 (evolution-2.32.3.tar.bz2) = cc2a2126ef4192193dce50c43c5bb6fc0a57fcde RMD160 (evolution-2.32.3.tar.bz2) = 1b64d00a38cf8ad5c273cc4f4aee73124fe818af @@ -9,11 +9,23 @@ SHA1 (patch-ab) = 792e5f7fdb0dc84fdbe0ef1ade21ce4a391e9328 SHA1 (patch-ac) = 853fe9f4a28fa1fe1266607b93e4ef9f63969b42 SHA1 (patch-ad) = 7efe568191ab181ea2b42ddac33db277b69b7d1e SHA1 (patch-calendar_gui_alarm-notify_alarm-queue.c) = 6466bcb2a53b2af82407a63d2e6439a985e286a5 +SHA1 (patch-calendar_gui_comp-util.c) = 5d9242c3b01f73082cf469491b0c86379929de0e +SHA1 (patch-calendar_gui_dialogs_recurrence-page.c) = 9cb2675d011b490810ef0c6997286ff9742d6f60 +SHA1 (patch-calendar_gui_dialogs_task-details-page.c) = a0c0f84a597fd2d991e6d878ff2148779d38e65c +SHA1 (patch-calendar_gui_e-cal-component-preview.c) = 93512fdbe8fbe2ce81bb4b6cb7a6e2ec3c25bfb3 +SHA1 (patch-calendar_gui_e-itip-control.c) = 680ff6e6861687e30e479479ec42528d67d5eb83 +SHA1 (patch-calendar_gui_e-meeting-store.c) = 754cddc4575ec8007c6134b435b54b6c4254209f +SHA1 (patch-calendar_gui_gnome-cal.c) = 457d750fc223cb904d64d864e128ccf2606f034c +SHA1 (patch-calendar_gui_itip-utils.c) = 8e780a506437f9b426976aefa05c5cdf42ac31f6 +SHA1 (patch-calendar_importers_icalendar-importer.c) = 6057fe6d1cd460aa27f2bb2e3a432364fdaff57b SHA1 (patch-plugins_caldav_caldav-browse-server.c) = c35c4acb0c3d28337d7aa811e81a4ce85ecec7b0 +SHA1 (patch-plugins_groupwise-features_process-meeting.c) = a975b1800504c9446a53f1152e2e1b49eeaa76bc +SHA1 (patch-plugins_groupwise-features_send-options.c) = c399fafa029fef8e4fce9f6d5be8dc345c3da76e +SHA1 (patch-plugins_itip-formatter_itip-formatter.c) = 103ba2b985520f0e9252e3130c19990f77a82400 SHA1 (patch-plugins_mail-notification_mail-notification.c) = 999ea9e55133077d1e3ed8c8dad26158b8e5260f SHA1 (patch-plugins_publish-calendar_publish-calendar.c) = 9af3644d68de690126c4cbaf7db9bb2da7b956b4 SHA1 (patch-ya) = 73872309c1d69d6d10bf04d867cc04ce17e724d3 -SHA1 (patch-yb) = 6d09dceb5405b29cde657eea6fa0fbd004a8bd1f +SHA1 (patch-yb) = 7f6df34a233edcd3d38ddfe32a3a45770fe58b4a SHA1 (patch-yc) = 1312f89cd935dab9fd3bfae860a055d9d2fef794 -SHA1 (patch-yd) = 09bb3fcd4223add3880253fb43cfd036b8294d1c +SHA1 (patch-yd) = fa04a365b079a000d86fe741b22f83261c611c36 SHA1 (patch-ye) = 57fd2cb481a8b465b94a2155d82633f0f4b3fa06 diff --git a/mail/evolution/patches/patch-calendar_gui_comp-util.c b/mail/evolution/patches/patch-calendar_gui_comp-util.c new file mode 100644 index 00000000000..be811ead308 --- /dev/null +++ b/mail/evolution/patches/patch-calendar_gui_comp-util.c @@ -0,0 +1,17 @@ +$NetBSD: patch-calendar_gui_comp-util.c,v 1.1 2018/05/16 16:15:23 jperkin Exp $ + +Support current libical API. + +--- calendar/gui/comp-util.c.orig 2011-03-29 18:38:46.000000000 +0000 ++++ calendar/gui/comp-util.c +@@ -127,8 +127,8 @@ cal_comp_util_compare_event_timezones (E + /* If the event uses UTC for DTSTART & DTEND, return TRUE. Outlook + will send single events as UTC, so we don't want to mark all of + these. */ +- if ((!start_datetime.value || start_datetime.value->is_utc) +- && (!end_datetime.value || end_datetime.value->is_utc)) { ++ if ((!start_datetime.value || icaltime_is_utc(*start_datetime.value)) ++ && (!end_datetime.value || icaltime_is_utc(*end_datetime.value))) { + retval = TRUE; + goto out; + } diff --git a/mail/evolution/patches/patch-calendar_gui_dialogs_recurrence-page.c b/mail/evolution/patches/patch-calendar_gui_dialogs_recurrence-page.c new file mode 100644 index 00000000000..51e10ccd05b --- /dev/null +++ b/mail/evolution/patches/patch-calendar_gui_dialogs_recurrence-page.c @@ -0,0 +1,15 @@ +$NetBSD: patch-calendar_gui_dialogs_recurrence-page.c,v 1.1 2018/05/16 16:15:23 jperkin Exp $ + +Support current libical API. + +--- calendar/gui/dialogs/recurrence-page.c.orig 2011-03-29 18:38:46.000000000 +0000 ++++ calendar/gui/dialogs/recurrence-page.c +@@ -1516,7 +1516,7 @@ fill_ending_date (RecurrencePage *rpage, + r->until.minute = 0; + r->until.second = 0; + r->until.is_date = TRUE; +- r->until.is_utc = FALSE; ++ r->until.zone = icaltimezone_get_utc_timezone(); + + e_cal_component_free_datetime (&dt); + } diff --git a/mail/evolution/patches/patch-calendar_gui_dialogs_task-details-page.c b/mail/evolution/patches/patch-calendar_gui_dialogs_task-details-page.c new file mode 100644 index 00000000000..1f704e89e35 --- /dev/null +++ b/mail/evolution/patches/patch-calendar_gui_dialogs_task-details-page.c @@ -0,0 +1,24 @@ +$NetBSD: patch-calendar_gui_dialogs_task-details-page.c,v 1.1 2018/05/16 16:15:23 jperkin Exp $ + +Support current libical API. + +--- calendar/gui/dialogs/task-details-page.c.orig 2011-03-29 18:38:46.000000000 +0000 ++++ calendar/gui/dialogs/task-details-page.c +@@ -341,7 +341,7 @@ task_details_page_fill_component (CompEd + icalcomplete = icaltime_null_time (); + + /* COMPLETED must be in UTC. */ +- icalcomplete.is_utc = 1; ++ icalcomplete.zone = icaltimezone_get_utc_timezone(); + + /* Completed Date. */ + if (!e_date_edit_date_is_valid (E_DATE_EDIT (priv->completed_date)) || +@@ -503,7 +503,7 @@ complete_date_changed (TaskDetailsPage * + /* Get the current time in UTC. */ + zone = icaltimezone_get_utc_timezone (); + completed_tt = icaltime_from_timet_with_zone (ctime, FALSE, zone); +- completed_tt.is_utc = TRUE; ++ completed_tt.zone = icaltimezone_get_utc_timezone(); + + dates.start = NULL; + dates.end = NULL; diff --git a/mail/evolution/patches/patch-calendar_gui_e-cal-component-preview.c b/mail/evolution/patches/patch-calendar_gui_e-cal-component-preview.c new file mode 100644 index 00000000000..c0627e30054 --- /dev/null +++ b/mail/evolution/patches/patch-calendar_gui_e-cal-component-preview.c @@ -0,0 +1,15 @@ +$NetBSD: patch-calendar_gui_e-cal-component-preview.c,v 1.1 2018/05/16 16:15:23 jperkin Exp $ + +Support current libical API. + +--- calendar/gui/e-cal-component-preview.c.orig 2011-03-29 18:38:46.000000000 +0000 ++++ calendar/gui/e-cal-component-preview.c +@@ -143,7 +143,7 @@ timet_to_str_with_zone (ECalComponentDat + /* If we can't find the zone, we'll guess its "local" */ + if (!e_cal_get_timezone (ecal, dt->tzid, &zone, NULL)) + zone = NULL; +- } else if (dt->value->is_utc) { ++ } else if (icaltime_is_utc(*dt->value)) { + zone = icaltimezone_get_utc_timezone (); + } else { + zone = NULL; diff --git a/mail/evolution/patches/patch-calendar_gui_e-itip-control.c b/mail/evolution/patches/patch-calendar_gui_e-itip-control.c new file mode 100644 index 00000000000..3790ca5f94f --- /dev/null +++ b/mail/evolution/patches/patch-calendar_gui_e-itip-control.c @@ -0,0 +1,42 @@ +$NetBSD: patch-calendar_gui_e-itip-control.c,v 1.1 2018/05/16 16:15:23 jperkin Exp $ + +Support current libical API. + +--- calendar/gui/e-itip-control.c.orig 2011-03-29 18:38:46.000000000 +0000 ++++ calendar/gui/e-itip-control.c +@@ -673,7 +673,7 @@ write_label_piece (EItipControl *itip, E + /* UTC times get converted to the current timezone. This is done for + the COMPLETED property, which is always in UTC, and also because + Outlook sends simple events as UTC times. */ +- if (dt->value->is_utc) { ++ if (icaltime_is_utc(*dt->value)) { + zone = calendar_config_get_icaltimezone (); + icaltimezone_convert_time (dt->value, icaltimezone_get_utc_timezone (), zone); + } +@@ -691,7 +691,7 @@ write_label_piece (EItipControl *itip, E + time_buf, sizeof (time_buf)); + g_string_append (buffer, time_buf); + +- if (!dt->value->is_utc && dt->tzid) { ++ if (!icaltime_is_utc(*dt->value) && dt->tzid) { + zone = icalcomponent_get_timezone (priv->top_level, dt->tzid); + } + +@@ -930,7 +930,7 @@ set_date_label (EItipControl *itip, + if (type == E_CAL_COMPONENT_TODO && datetime.value) { + str = g_strdup_printf ("<b>%s:</b>", _("Completed")); + /* Pass TRUE as is_utc, so it gets converted to the current timezone. */ +- datetime.value->is_utc = TRUE; ++ datetime.value->zone = icaltimezone_get_utc_timezone(); + write_label_piece (itip, &datetime, buffer, str, "<br>", FALSE); + wrote = TRUE; + task_completed = TRUE; +@@ -1898,7 +1898,7 @@ change_status (icalcomponent *ical_comp, + if (prop) { + icalparameter *param; + +- icalproperty_remove_parameter (prop, ICAL_PARTSTAT_PARAMETER); ++ icalproperty_remove_parameter_by_kind (prop, ICAL_PARTSTAT_PARAMETER); + param = icalparameter_new_partstat (status); + icalproperty_add_parameter (prop, param); + } else { diff --git a/mail/evolution/patches/patch-calendar_gui_e-meeting-store.c b/mail/evolution/patches/patch-calendar_gui_e-meeting-store.c new file mode 100644 index 00000000000..291e409cf8f --- /dev/null +++ b/mail/evolution/patches/patch-calendar_gui_e-meeting-store.c @@ -0,0 +1,24 @@ +$NetBSD: patch-calendar_gui_e-meeting-store.c,v 1.1 2018/05/16 16:15:23 jperkin Exp $ + +Support current libical API. + +--- calendar/gui/e-meeting-store.c.orig 2011-03-29 18:38:46.000000000 +0000 ++++ calendar/gui/e-meeting-store.c +@@ -1072,7 +1072,7 @@ process_free_busy_comp (EMeetingAttendee + icaltimezone *ds_zone; + + dtstart = icalproperty_get_dtstart (ip); +- if (!dtstart.is_utc) ++ if (!icaltime_is_utc(dtstart)) + ds_zone = find_zone (ip, tz_top_level); + else + ds_zone = icaltimezone_get_utc_timezone (); +@@ -1091,7 +1091,7 @@ process_free_busy_comp (EMeetingAttendee + icaltimezone *de_zone; + + dtend = icalproperty_get_dtend (ip); +- if (!dtend.is_utc) ++ if (!icaltime_is_utc(dtend)) + de_zone = find_zone (ip, tz_top_level); + else + de_zone = icaltimezone_get_utc_timezone (); diff --git a/mail/evolution/patches/patch-calendar_gui_gnome-cal.c b/mail/evolution/patches/patch-calendar_gui_gnome-cal.c new file mode 100644 index 00000000000..b7ebb53998c --- /dev/null +++ b/mail/evolution/patches/patch-calendar_gui_gnome-cal.c @@ -0,0 +1,22 @@ +$NetBSD: patch-calendar_gui_gnome-cal.c,v 1.1 2018/05/16 16:15:23 jperkin Exp $ + +Support current libical API. + +--- calendar/gui/gnome-cal.c.orig 2011-03-29 18:38:46.000000000 +0000 ++++ calendar/gui/gnome-cal.c +@@ -743,13 +743,13 @@ ensure_dates_are_in_default_zone (GnomeC + return; + + dt = icalcomponent_get_dtstart (icalcomp); +- if (dt.is_utc) { ++ if (icaltime_is_utc(dt)) { + dt = icaltime_convert_to_zone (dt, timezone); + icalcomponent_set_dtstart (icalcomp, dt); + } + + dt = icalcomponent_get_dtend (icalcomp); +- if (dt.is_utc) { ++ if (icaltime_is_utc(dt)) { + dt = icaltime_convert_to_zone (dt, timezone); + icalcomponent_set_dtend (icalcomp, dt); + } diff --git a/mail/evolution/patches/patch-calendar_gui_itip-utils.c b/mail/evolution/patches/patch-calendar_gui_itip-utils.c new file mode 100644 index 00000000000..09715c450f9 --- /dev/null +++ b/mail/evolution/patches/patch-calendar_gui_itip-utils.c @@ -0,0 +1,15 @@ +$NetBSD: patch-calendar_gui_itip-utils.c,v 1.1 2018/05/16 16:15:23 jperkin Exp $ + +Support current libical API. + +--- calendar/gui/itip-utils.c.orig 2011-03-29 18:38:46.000000000 +0000 ++++ calendar/gui/itip-utils.c +@@ -1115,7 +1115,7 @@ comp_compliant (ECalComponentItipMethod + r->until.is_date = FALSE; + + icaltimezone_convert_time (&r->until, from_zone, to_zone); +- r->until.is_utc = TRUE; ++ r->until.zone = icaltimezone_get_utc_timezone(); + + e_cal_component_free_datetime (&dt); + e_cal_component_set_rrule_list (clone, rrule_list); diff --git a/mail/evolution/patches/patch-calendar_importers_icalendar-importer.c b/mail/evolution/patches/patch-calendar_importers_icalendar-importer.c new file mode 100644 index 00000000000..8a7f28c21aa --- /dev/null +++ b/mail/evolution/patches/patch-calendar_importers_icalendar-importer.c @@ -0,0 +1,14 @@ +$NetBSD: patch-calendar_importers_icalendar-importer.c,v 1.1 2018/05/16 16:15:23 jperkin Exp $ + +Support current libical API. + +--- calendar/importers/icalendar-importer.c.orig 2011-03-29 18:38:46.000000000 +0000 ++++ calendar/importers/icalendar-importer.c +@@ -39,6 +39,7 @@ + #include <libecal/e-cal-time-util.h> + #include <libedataserverui/e-source-selector.h> + #include <libical/icalvcal.h> ++#include <libical/vcc.h> + #include "evolution-calendar-importer.h" + #include "shell/e-shell.h" + #include "common/authentication.h" diff --git a/mail/evolution/patches/patch-plugins_groupwise-features_process-meeting.c b/mail/evolution/patches/patch-plugins_groupwise-features_process-meeting.c new file mode 100644 index 00000000000..0d2bdc8d050 --- /dev/null +++ b/mail/evolution/patches/patch-plugins_groupwise-features_process-meeting.c @@ -0,0 +1,15 @@ +$NetBSD: patch-plugins_groupwise-features_process-meeting.c,v 1.1 2018/05/16 16:15:23 jperkin Exp $ + +Support current libical API. + +--- plugins/groupwise-features/process-meeting.c.orig 2011-03-29 18:38:48.000000000 +0000 ++++ plugins/groupwise-features/process-meeting.c +@@ -118,7 +118,7 @@ change_status (icalcomponent *ical_comp, + if (prop) { + icalparameter *param; + +- icalproperty_remove_parameter (prop, ICAL_PARTSTAT_PARAMETER); ++ icalproperty_remove_parameter_by_kind (prop, ICAL_PARTSTAT_PARAMETER); + param = icalparameter_new_partstat (status); + icalproperty_add_parameter (prop, param); + } else { diff --git a/mail/evolution/patches/patch-plugins_groupwise-features_send-options.c b/mail/evolution/patches/patch-plugins_groupwise-features_send-options.c new file mode 100644 index 00000000000..f1130a3a051 --- /dev/null +++ b/mail/evolution/patches/patch-plugins_groupwise-features_send-options.c @@ -0,0 +1,15 @@ +$NetBSD: patch-plugins_groupwise-features_send-options.c,v 1.1 2018/05/16 16:15:23 jperkin Exp $ + +Support current libical API. + +--- plugins/groupwise-features/send-options.c.orig 2011-03-29 18:38:48.000000000 +0000 ++++ plugins/groupwise-features/send-options.c +@@ -276,7 +276,7 @@ e_send_options_copy_general_opts (ESendO + gint diff; + icaltimetype temp, current; + +- temp = icaltime_from_timet (gopts->delay_until, 0); ++ temp = icaltime_from_timet_with_zone (gopts->delay_until, 0, NULL); + current = icaltime_today (); + diff = temp.day - current.day; + ggopts->delay_until = diff; diff --git a/mail/evolution/patches/patch-plugins_itip-formatter_itip-formatter.c b/mail/evolution/patches/patch-plugins_itip-formatter_itip-formatter.c new file mode 100644 index 00000000000..71b55520aff --- /dev/null +++ b/mail/evolution/patches/patch-plugins_itip-formatter_itip-formatter.c @@ -0,0 +1,39 @@ +$NetBSD: patch-plugins_itip-formatter_itip-formatter.c,v 1.1 2018/05/16 16:15:23 jperkin Exp $ + +Support current libical API. + +--- plugins/itip-formatter/itip-formatter.c.orig 2011-03-29 18:38:48.000000000 +0000 ++++ plugins/itip-formatter/itip-formatter.c +@@ -941,7 +941,7 @@ change_status (icalcomponent *ical_comp, + if (prop) { + icalparameter *param; + +- icalproperty_remove_parameter (prop, ICAL_PARTSTAT_PARAMETER); ++ icalproperty_remove_parameter_by_kind (prop, ICAL_PARTSTAT_PARAMETER); + param = icalparameter_new_partstat (status); + icalproperty_add_parameter (prop, param); + } else { +@@ -2390,9 +2390,9 @@ format_itip_object (EMFormatHTML *efh, G + + /* If the timezone is not in the component, guess the local time */ + /* Should we guess if the timezone is an olsen name somehow? */ +- if (datetime.value->is_utc) ++ if (icaltime_is_utc(*datetime.value)) + from_zone = icaltimezone_get_utc_timezone (); +- else if (!datetime.value->is_utc && datetime.tzid) ++ else if (!icaltime_is_utc(*datetime.value) && datetime.tzid) + from_zone = icalcomponent_get_timezone (info->top_level, datetime.tzid); + else + from_zone = NULL; +@@ -2426,9 +2426,9 @@ format_itip_object (EMFormatHTML *efh, G + + /* If the timezone is not in the component, guess the local time */ + /* Should we guess if the timezone is an olsen name somehow? */ +- if (datetime.value->is_utc) ++ if (icaltime_is_utc(*datetime.value)) + from_zone = icaltimezone_get_utc_timezone (); +- else if (!datetime.value->is_utc && datetime.tzid) ++ else if (!icaltime_is_utc(*datetime.value) && datetime.tzid) + from_zone = icalcomponent_get_timezone (info->top_level, datetime.tzid); + else + from_zone = NULL; diff --git a/mail/evolution/patches/patch-yb b/mail/evolution/patches/patch-yb index dc350a0b533..ec304128224 100644 --- a/mail/evolution/patches/patch-yb +++ b/mail/evolution/patches/patch-yb @@ -1,8 +1,10 @@ -$NetBSD: patch-yb,v 1.2 2009/10/24 12:57:56 drochner Exp $ +$NetBSD: patch-yb,v 1.3 2018/05/16 16:15:23 jperkin Exp $ ---- calendar/gui/e-cal-model.c.orig 2009-10-18 02:54:18.000000000 +0200 +Support current libical API. + +--- calendar/gui/e-cal-model.c.orig 2011-04-14 11:42:52.000000000 +0000 +++ calendar/gui/e-cal-model.c -@@ -163,8 +163,8 @@ e_cal_model_class_init (ECalModelClass * +@@ -380,8 +380,8 @@ e_cal_model_class_init (ECalModelClass * G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ECalModelClass, time_range_changed), NULL, NULL, @@ -13,7 +15,32 @@ $NetBSD: patch-yb,v 1.2 2009/10/24 12:57:56 drochner Exp $ signals[ROW_APPENDED] = g_signal_new ("row_appended", -@@ -2185,7 +2185,8 @@ e_cal_model_set_time_range (ECalModel *m +@@ -920,7 +920,7 @@ e_cal_model_update_comp_time (ECalModel + icalproperty_add_parameter (prop, param); + } + } else { +- icalproperty_remove_parameter (prop, ICAL_TZID_PARAMETER); ++ icalproperty_remove_parameter_by_kind (prop, ICAL_TZID_PARAMETER); + } + } + } +@@ -1710,13 +1710,13 @@ ensure_dates_are_in_default_zone (ECalMo + return; + + dt = icalcomponent_get_dtstart (icalcomp); +- if (dt.is_utc) { ++ if (icaltime_is_utc(dt)) { + dt = icaltime_convert_to_zone (dt, zone); + icalcomponent_set_dtstart (icalcomp, dt); + } + + dt = icalcomponent_get_dtend (icalcomp); +- if (dt.is_utc) { ++ if (icaltime_is_utc(dt)) { + dt = icaltime_convert_to_zone (dt, zone); + icalcomponent_set_dtend (icalcomp, dt); + } +@@ -2513,7 +2513,8 @@ e_cal_model_set_time_range (ECalModel *m priv->start = start; priv->end = end; diff --git a/mail/evolution/patches/patch-yd b/mail/evolution/patches/patch-yd index 47cb4e2b973..93e93b7ed15 100644 --- a/mail/evolution/patches/patch-yd +++ b/mail/evolution/patches/patch-yd @@ -1,8 +1,10 @@ -$NetBSD: patch-yd,v 1.2 2009/10/24 12:57:56 drochner Exp $ +$NetBSD: patch-yd,v 1.3 2018/05/16 16:15:23 jperkin Exp $ ---- calendar/gui/e-day-view.c.orig 2009-10-18 01:08:48.000000000 +0200 +Support current libical API. + +--- calendar/gui/e-day-view.c.orig 2011-03-29 18:38:46.000000000 +0000 +++ calendar/gui/e-day-view.c -@@ -469,11 +469,11 @@ e_day_view_class_init (EDayViewClass *cl +@@ -745,11 +745,11 @@ e_day_view_class_init (EDayViewClass *cl } static void @@ -16,3 +18,25 @@ $NetBSD: patch-yd,v 1.2 2009/10/24 12:57:56 drochner Exp $ g_return_if_fail (E_IS_DAY_VIEW (day_view)); +@@ -6540,8 +6540,8 @@ e_day_view_event_move (ECalendarView *ca + return TRUE; + start_dt = e_day_view_convert_grid_position_to_time (day_view, day, resize_start_row); + end_dt = e_day_view_convert_grid_position_to_time (day_view, day, resize_end_row + 1); +- start_time = icaltime_from_timet (start_dt, 0); +- end_time = icaltime_from_timet (end_dt, 0); ++ start_time = icaltime_from_timet_with_zone (start_dt, 0, NULL); ++ end_time = icaltime_from_timet_with_zone (end_dt, 0, NULL); + icaltime_adjust (&start_time ,-1,0,0,0); + icaltime_adjust (&end_time ,-1,0,0,0); + start_dt = icaltime_as_timet (start_time); +@@ -6552,8 +6552,8 @@ e_day_view_event_move (ECalendarView *ca + return TRUE; + start_dt = e_day_view_convert_grid_position_to_time (day_view, day, resize_start_row); + end_dt = e_day_view_convert_grid_position_to_time (day_view, day, resize_end_row + 1); +- start_time = icaltime_from_timet (start_dt, 0); +- end_time = icaltime_from_timet (end_dt, 0); ++ start_time = icaltime_from_timet_with_zone (start_dt, 0, NULL); ++ end_time = icaltime_from_timet_with_zone (end_dt, 0, NULL); + icaltime_adjust (&start_time ,1,0,0,0); + icaltime_adjust (&end_time ,1,0,0,0); + start_dt = icaltime_as_timet (start_time); |