replaced "Calendar *cal" with "CalClient *calc" in the GnomeCalendar

        * gui/gnome-cal.h: replaced "Calendar *cal" with "CalClient *calc"
        in the GnomeCalendar struct.

        * gui/*.c: tracked change from Calendar * to CalClient

        * gui/main.c: moved alarm_defaults from here to cal-util/calobj.c
        (calendar_get_events_in_range): pulled this out of calendar.c and
        fixed it up to use cal-client stuff.  i'm not sure where to put it yet.

        * gui/main.c (calendar_iterate): pulled this one out of calendar.c also

svn path=/trunk/; revision=2090

1 files changed, 4 insertions, 3 deletions

diff --git a/calendar/gui/mark.c b/calendar/gui/mark.c
index 288b6d3b11..660fdba6ab 100644
--- a/calendar/gui/mark.c
+++ b/calendar/gui/mark.c
@@ -101,7 +101,7 @@ mark_event_in_month (GnomeMonthItem *mitem, time_t start, time_t end)
 }
 
 void
-mark_month_item (GnomeMonthItem *mitem, Calendar *cal)
+mark_month_item (GnomeMonthItem *mitem, GnomeCalendar *cal)
 {
 	time_t month_begin, month_end;
 	GList *list, *l;
@@ -114,7 +114,8 @@ mark_month_item (GnomeMonthItem *mitem, Calendar *cal)
 	month_begin = time_month_begin (time_from_day (mitem->year, mitem->month, 1));
 	month_end = time_month_end (month_begin);
 
-	list = calendar_get_events_in_range (cal, month_begin, month_end);
+	list =
+	  calendar_get_events_in_range (cal->calc, month_begin, month_end);
 
 	for (l = list; l; l = l->next) {
 		co = l->data;
@@ -124,7 +125,7 @@ mark_month_item (GnomeMonthItem *mitem, Calendar *cal)
 		mark_event_in_month (mitem, MAX (co->ev_start, month_begin), MIN (co->ev_end, month_end));
 	}
 
-	calendar_destroy_event_list (list);
+	/* calendar_destroy_event_list (list); DELETE / FIX ME */
 }
 
 void