aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog2
-rw-r--r--calendar/gui/print.c9
2 files changed, 7 insertions, 4 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index dba5aa369b..7d14f2df96 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -6,6 +6,8 @@
(print_day_details_cb): use ECalModelGenerateInstancesData
(print_day_long_event): use event color
(print_day_event): ditto
+ (print_month_small): use e_cal_model_generate_instances
+ (instance_cb): use ECalModelGenerateInstancesData
2004-01-18 Radek Doulik <rodo@ximian.com>
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index e4b0dbe737..f83cb473b5 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -548,7 +548,8 @@ format_date(time_t time, int flags, char *buffer, int bufflen)
static gboolean
instance_cb (ECalComponent *comp, time_t instance_start, time_t instance_end, gpointer data)
{
- gboolean *found = data;
+
+ gboolean *found = ((ECalModelGenerateInstancesData *) data)->cb_data;
*found = TRUE;
@@ -663,9 +664,9 @@ print_month_small (GnomePrintContext *pc, GnomeCalendar *gcal, time_t month,
sprintf (buf, "%d", day);
/* this is a slow messy way to do this ... but easy ... */
- e_cal_generate_instances (client, now,
- time_day_end_with_zone (now, zone),
- instance_cb, &found);
+ e_cal_model_generate_instances (gnome_calendar_get_calendar_model (gcal), now,
+ time_day_end_with_zone (now, zone),
+ instance_cb, &found);
font = found ? font_bold : font_normal;