aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/e-day-view-main-item.c9
2 files changed, 12 insertions, 4 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index c2671dd3e8..c1573c9ae7 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,6 +1,11 @@
2000-08-21 JP Rosevear <jpr@helixcode.com>
- * gui/e-week-view-event-item.c (e_day_view_top_draw_long_event):
+ * gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
+ Use CalComponent instead of iCalObject. #if some alarm stuff
+
+2000-08-21 JP Rosevear <jpr@helixcode.com>
+
+ * gui/e-day-view-top-item.c (e_day_view_top_draw_long_event):
Use CalComponent instead of iCalObject. #if some alarm stuff
2000-08-21 JP Rosevear <jpr@helixcode.com>
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index b3a531f62e..8353c0497e 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -445,7 +445,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
gint item_x, item_y, item_w, item_h, bar_y1, bar_y2;
GtkStyle *style;
GdkGC *gc;
- iCalObject *ico;
+ CalComponent *comp;
gint num_icons, icon_x, icon_y, icon_x_inc, icon_y_inc;
gint max_icon_w, max_icon_h;
gboolean draw_reminder_icon, draw_recurrence_icon;
@@ -546,15 +546,18 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
icon_x = item_x + E_DAY_VIEW_BAR_WIDTH + E_DAY_VIEW_ICON_X_PAD;
icon_y = item_y + E_DAY_VIEW_EVENT_BORDER_HEIGHT
+ E_DAY_VIEW_ICON_Y_PAD;
- ico = event->ico;
+ comp = event->comp;
+#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_rrules (comp)
+ || cal_component_has_rdates (comp)) {
draw_recurrence_icon = TRUE;
num_icons++;
}