added vCalendar importer and intelligent GnomeCalendar importer code here,

2002-02-08  Damon Chaplin  <damon@ximian.com>

	* importers/icalendar-importer.c: added vCalendar importer and
	intelligent GnomeCalendar importer code here, as it shares a lot of
	code with the iCalendar importer.

	NOTE: check_folder_type() needs to be finished at some point.
	It needs a new shell Corba call so it can decide whether to import
	events or tasks into the folder. Currently it just imports both.

	* importers/main.c (importer_factory_fn): create vCalendar importer
	or GnomeCalendar importer if required.

	* importers/evolution-calendar-importer.h: added declarations for
	creating a vCalendar importer and intelligent Gnome Calendar importer.

	* importers/Makefile.am: added -DEVOLUTION_SOUNDDIR so the importer
	knows what filename to use for audio alarms in vCalendar files.
	Added libicalvcal-evolution to LDADD.

	* importers/GNOME_Evolution_Calendar_Importer.oaf.in: added vCalendar
	importer and intelligent Gnome Calendar importer.

	* gui/comp-util.c (cal_comp_util_compare_event_timezones): return TRUE
	if the event uses UTC. We don't want to flag all events from Outlook,
	which use UTC.

svn path=/trunk/; revision=15628

1 files changed, 16 insertions, 0 deletions

diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c
index ec6c4fefbf..6b11322c05 100644
--- a/calendar/gui/comp-util.c
+++ b/calendar/gui/comp-util.c
@@ -114,6 +114,22 @@ cal_comp_util_compare_event_timezones (CalComponent *comp,
 		goto out;
 	}
 
+	/* 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->is_utc && end_datetime.value->is_utc) {
+		retval = TRUE;
+		goto out;
+	}
+
+	/* If the event uses floating time for DTSTART & DTEND, return TRUE.
+	   Imported vCalendar files will use floating times, so we don't want
+	   to mark all of these. */
+	if (!start_datetime.tzid && !end_datetime.tzid) {
+		retval = TRUE;
+		goto out;
+	}
+
 	/* FIXME: DURATION may be used instead. */
 	if (cal_component_compare_tzid (tzid, start_datetime.tzid)
 	    && cal_component_compare_tzid (tzid, end_datetime.tzid)) {