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, 19 insertions, 4 deletions

diff --git a/calendar/gui/main.h b/calendar/gui/main.h
index 2785e1d2d1..e05fd4367b 100644
--- a/calendar/gui/main.h
+++ b/calendar/gui/main.h
@@ -93,9 +93,24 @@ void save_default_calendar (GnomeCalendar *gcal);
 GnomeCalendar *new_calendar (char *full_name, char *calendar_file,
 			     char *geometry, char *page, gboolean hidden);
 
-#endif
-
-
-
 
+/*----------------------------------------------------------------------*/
+/* FIX ME -- where should this stuff go?                                */
+/*----------------------------------------------------------------------*/
 
+/* This is only used by the calendar_get_events_in_range routine to get
+ * a list of objects that recur on a specific date
+ */
+typedef struct {
+	time_t     ev_start;
+	time_t     ev_end;
+	iCalObject *ico;
+} CalendarObject;
+
+GList *calendar_get_events_in_range (CalClient *calc,
+				     time_t start, time_t end);
+void
+calendar_iterate (GnomeCalendar *cal,
+		  time_t start, time_t end,
+		  calendarfn cb, void *closure);
+#endif