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

diff --git a/calendar/gui/mark.h b/calendar/gui/mark.h
index cf8f7c1496..ea7315a43f 100644
--- a/calendar/gui/mark.h
+++ b/calendar/gui/mark.h
@@ -8,7 +8,7 @@
 #ifndef MARK_H
 #define MARK_H
 
-#include "calendar.h"
+/*#include "calendar.h"*/
 #include "gnome-month-item.h"
 
 
@@ -34,10 +34,11 @@ typedef char * (* GetColorFunc) (ColorProp propnum, gpointer data);
 /* Sets the user-configured colors and font for a month item.  It also tags the days as unmarked. */
 void colorify_month_item (GnomeMonthItem *month, GetColorFunc func, gpointer func_data);
 
-/* Takes a monthly calendar item and marks the days that have events scheduled for them in the
- * specified calendar.  It also highlights the current day.
+/* Takes a monthly calendar item and marks the days that have events
+ * scheduled for them in the specified calendar.  It also highlights
+ * the current day.
  */
-void mark_month_item (GnomeMonthItem *mitem, Calendar *cal);
+void mark_month_item (GnomeMonthItem *mitem, GnomeCalendar *cal);
 
 /* Marks a day specified by index, not by day number */
 void mark_month_item_index (GnomeMonthItem *mitem, int index, GetColorFunc func, gpointer func_data);