Use new cal_component_has_recurrences convenience function

2000-09-06  JP Rosevear  <jpr@helixcode.com>

	* gui/e-day-view-main-item.c
(e_day_view_main_item_draw_day_event):
	Use new cal_component_has_recurrences convenience function

	* gui/e-week-view.c (e_week_view_show_popup_menu): ditto

	* gui/e-week-view-event-item.c
(e_week_view_event_item_draw_icons):
	ditto

	* gui/calendar-model.c (calendar_model_value_at): ditto
	(calendar_model_value_at): ditto

	* gui/e-day-view.c (e_day_view_on_event_click): ditto
	(e_day_view_on_event_right_click): ditto
	(e_day_view_on_top_canvas_motion): ditto
	(e_day_view_on_top_canvas_motion): ditto
	(e_day_view_on_main_canvas_motion): ditto
	(e_day_view_on_main_canvas_motion): ditto
	(e_day_view_reshape_day_event): ditto

	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
	ditto

	* gui/e-day-view.c (e_day_view_on_long_event_click): ditto

svn path=/trunk/; revision=5220

1 files changed, 2 insertions, 9 deletions

diff --git a/calendar/gui/calendar-model.c b/calendar/gui/calendar-model.c
index 51f2c28a35..9abfded4a2 100644
--- a/calendar/gui/calendar-model.c
+++ b/calendar/gui/calendar-model.c
@@ -536,13 +536,6 @@ get_has_alarms (CalComponent *comp)
 	return retval;
 }
 
-/* Returns whether the component has any recurrences defined for it */
-static gboolean
-get_has_recurrences (CalComponent *comp)
-{
-	return cal_component_has_rdates (comp) || cal_component_has_rrules (comp);
-}
-
 /* Returns whether the completion date has been set on a component */
 static gboolean
 get_is_complete (CalComponent *comp)
@@ -674,7 +667,7 @@ calendar_model_value_at (ETableModel *etm, int col, int row)
 	case CAL_COMPONENT_FIELD_ICON:
 		/* FIXME: Also support 'Assigned to me' & 'Assigned to someone
 		   else'. */
-		if (get_has_recurrences (comp))
+		if (cal_component_has_recurrences (comp))
 			return GINT_TO_POINTER (1);
 		else
 			return GINT_TO_POINTER (0);
@@ -683,7 +676,7 @@ calendar_model_value_at (ETableModel *etm, int col, int row)
 		return GINT_TO_POINTER (get_is_complete (comp));
 
 	case CAL_COMPONENT_FIELD_RECURRING:
-		return GINT_TO_POINTER (get_has_recurrences (comp));
+		return GINT_TO_POINTER (cal_component_has_recurrences (comp));
 
 	case CAL_COMPONENT_FIELD_OVERDUE:
 		return GINT_TO_POINTER (get_is_overdue (comp));