diff options
| -rw-r--r-- | calendar/ChangeLog | 5 | ||||
| -rw-r--r-- | calendar/gui/Makefile.am | 2 | ||||
| -rw-r--r-- | calendar/gui/e-week-view-event-item.c | 9 |
3 files changed, 13 insertions, 3 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 3340a21ecb..72a0466cf0 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,5 +1,10 @@ 2000-08-20 JP Rosevear <jpr@helixcode.com> + * gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons): + Use CalComponent instead of iCalObject. #if some alarm stuff + +2000-08-20 JP Rosevear <jpr@helixcode.com> + * gui/e-week-view.c (e_week_view_update_event): Use CalComponent instead of iCalObject. Work around not having a compare dates routine for two CalComponents. diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 4927f7c6b6..995d51c32a 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -42,6 +42,8 @@ glade_DATA = \ glade_messages = event-editor-dialog.glade.h evolution_calendar_SOURCES = \ + e-day-view.c \ + e-day-view.h \ alarm.c \ alarm.h \ calendar-commands.c \ diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c index 8b4aea1d2d..f8812f6c33 100644 --- a/calendar/gui/e-week-view-event-item.c +++ b/calendar/gui/e-week-view-event-item.c @@ -487,7 +487,7 @@ e_week_view_event_item_draw_icons (EWeekViewEventItem *wveitem, EWeekView *week_view; EWeekViewEvent *event; EWeekViewEventSpan *span; - iCalObject *ico; + CalComponent *comp; GdkGC *gc; gint num_icons = 0, icon_x_inc; gboolean draw_reminder_icon = FALSE, draw_recurrence_icon = FALSE; @@ -498,17 +498,20 @@ e_week_view_event_item_draw_icons (EWeekViewEventItem *wveitem, wveitem->event_num); span = &g_array_index (week_view->spans, EWeekViewEventSpan, event->spans_index + wveitem->span_num); - ico = event->ico; + comp = event->comp; gc = week_view->main_gc; +#if 0 if (ico->dalarm.enabled || ico->malarm.enabled || ico->palarm.enabled || ico->aalarm.enabled) { draw_reminder_icon = TRUE; num_icons++; } +#endif - if (ico->recur) { + if (cal_component_has_rdates (comp) + || cal_component_has_rrules (comp)) { draw_recurrence_icon = TRUE; num_icons++; } |