aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog9
-rw-r--r--calendar/cal-util/cal-component.c2
-rw-r--r--calendar/gui/dialogs/recurrence-page.c1
3 files changed, 10 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 3dce06c2aa..a8799ab698 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,12 @@
+2001-07-17 Damon Chaplin <damon@ximian.com>
+
+ * gui/dialogs/recurrence-page.c (init_widgets): don't show the time
+ in the EDateEdit widget for adding EXDATEs.
+
+ * cal-util/cal-component.c (cal_component_alarm_set_trigger): don't
+ set t.time.is_date to -1. It is a boolean flag, 0 or 1. We probably
+ don't want a date value, so we leave it at 0.
+
2001-07-18 Rodrigo Moya <rodrigo@ximian.com>
* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
diff --git a/calendar/cal-util/cal-component.c b/calendar/cal-util/cal-component.c
index d340cea60f..596618733d 100644
--- a/calendar/cal-util/cal-component.c
+++ b/calendar/cal-util/cal-component.c
@@ -4814,14 +4814,12 @@ cal_component_alarm_set_trigger (CalComponentAlarm *alarm, CalAlarmTrigger trigg
switch (trigger.type) {
case CAL_ALARM_TRIGGER_RELATIVE_START:
t.duration = trigger.u.rel_duration;
- t.time.is_date = -1;
value_type = ICAL_VALUE_DURATION;
related = ICAL_RELATED_START;
break;
case CAL_ALARM_TRIGGER_RELATIVE_END:
t.duration = trigger.u.rel_duration;
- t.time.is_date = -1;
value_type = ICAL_VALUE_DURATION;
related = ICAL_RELATED_END;
break;
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index 4938877133..dc41ce37b6 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -2131,6 +2131,7 @@ init_widgets (RecurrencePage *rpage)
/* Make sure the EDateEdit widgets and ECalendarItem use our timezones
to get the current time. */
+ e_date_edit_set_show_time (E_DATE_EDIT (priv->exception_date), FALSE);
e_date_edit_set_get_time_callback (E_DATE_EDIT (priv->exception_date),
(EDateEditGetTimeCallback) comp_editor_get_current_time,
rpage, NULL);