aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/calendar-model.c5
2 files changed, 11 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 60cd4823a6..fa7ae5df06 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,12 @@
2003-04-09 JP Rosevear <jpr@ximian.com>
+ Fixes #40915
+
+ * gui/calendar-model.c (get_due_status): when getting the current
+ time for date values, use a timezone aware function
+
+2003-04-09 JP Rosevear <jpr@ximian.com>
+
Fixes #40952
* pcs/cal-backend-file.c (cal_backend_file_open): check for file
diff --git a/calendar/gui/calendar-model.c b/calendar/gui/calendar-model.c
index d4b5185351..ebe38ab6a3 100644
--- a/calendar/gui/calendar-model.c
+++ b/calendar/gui/calendar-model.c
@@ -633,9 +633,12 @@ typedef enum {
static CalendarModelDueStatus
get_due_status (CalendarModel *model, CalComponent *comp)
{
+ CalendarModelPrivate *priv;
CalComponentDateTime dt;
CalendarModelDueStatus retval;
+ priv = model->priv;
+
cal_component_get_due (comp, &dt);
/* First, do we have a due date? */
@@ -659,7 +662,7 @@ get_due_status (CalendarModel *model, CalComponent *comp)
if (dt.value->is_date) {
int cmp;
- now_tt = icaltime_today ();
+ now_tt = icaltime_current_time_with_zone (priv->zone);
cmp = icaltime_compare_date_only (*dt.value, now_tt);
if (cmp < 0)