From 873dfc7f89dcda2ce62feee64f6e800ba79fd84f Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Thu, 9 Mar 2000 14:25:56 +0000 Subject: 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 --- calendar/gui/year-view.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'calendar/gui/year-view.c') diff --git a/calendar/gui/year-view.c b/calendar/gui/year-view.c index 567340bde1..42c85a0d32 100644 --- a/calendar/gui/year-view.c +++ b/calendar/gui/year-view.c @@ -307,7 +307,8 @@ do_quick_view_popup (YearView *yv, GdkEventButton *event, int year, int month, i day_start = time_from_day (year, month, day); day_end = time_day_end (day_start); - list = calendar_get_events_in_range (yv->calendar->cal, day_start, day_end); + list = calendar_get_events_in_range (yv->calendar->calc, + day_start, day_end); strftime (date_str, sizeof (date_str), _("%a %b %d %Y"), localtime (&day_start)); qv = quick_view_new (yv->calendar, date_str, list); @@ -315,7 +316,7 @@ do_quick_view_popup (YearView *yv, GdkEventButton *event, int year, int month, i quick_view_do_popup (QUICK_VIEW (qv), event); gtk_widget_destroy (qv); - calendar_destroy_event_list (list); + /* calendar_destroy_event_list (list); DELETE */ } /* Event handler for days in the year's month items */ @@ -702,7 +703,8 @@ year_view_set (YearView *yv, time_t year) for (i = 0; i < 12; i++) { unmark_month_item (GNOME_MONTH_ITEM (yv->mitems[i])); - mark_month_item (GNOME_MONTH_ITEM (yv->mitems[i]), yv->calendar->cal); + mark_month_item (GNOME_MONTH_ITEM (yv->mitems[i]), + yv->calendar); } mark_current_day (yv); @@ -734,7 +736,8 @@ year_view_colors_changed (YearView *yv) for (i = 0; i < 12; i++) { colorify_month_item (GNOME_MONTH_ITEM (yv->mitems[i]), default_color_func, NULL); - mark_month_item (GNOME_MONTH_ITEM (yv->mitems[i]), yv->calendar->cal); + mark_month_item (GNOME_MONTH_ITEM (yv->mitems[i]), + yv->calendar); } mark_current_day (yv); -- cgit