aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog5
-rw-r--r--calendar/conduits/calendar/calendar-conduit.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index b881d16f24..53b6c7e950 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-29 JP Rosevear <jpr@ximian.com>
+
+ * conduits/calendar/calendar-conduit.c (is_all_day): handle date
+ values
+
2001-10-29 Rodrigo Moya <rodrigo@ximian.com>
* importers/: added evolution-calendar-importer binary, starting
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index 832651eb64..fcd976355d 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -346,6 +346,9 @@ is_all_day (CalClient *client, CalComponentDateTime *dt_start, CalComponentDateT
{
time_t dt_start_time, dt_end_time;
icaltimezone *timezone;
+
+ if (dt_start->value->is_date && dt_end->value->is_date)
+ return TRUE;
timezone = get_timezone (client, dt_start->tzid);
dt_start_time = icaltime_as_timet_with_zone (*dt_start->value, timezone);
@@ -537,7 +540,7 @@ local_record_from_comp (ECalLocalRecord *local, CalComponent *comp, ECalConduitC
CalComponentText *description;
CalComponentDateTime dt_start, dt_end;
CalComponentClassification classif;
- icaltimezone *default_tz = get_default_timezone ();
+ icaltimezone *default_tz = ctxt->timezone;
int i;
g_return_if_fail (local != NULL);