evolution: Fix build against current libical API.


(jperkin)

$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;
 	}

$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);
 			}

$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;

$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;

$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 {

$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 ();

$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);
 	}

$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);

$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"

$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 {

$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;

$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;