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, 3 insertions, 1 deletions

diff --git a/calendar/cal-util/cal-util.h b/calendar/cal-util/cal-util.h
index 5087eee4d3..c5c3fcdb00 100644
--- a/calendar/cal-util/cal-util.h
+++ b/calendar/cal-util/cal-util.h
@@ -25,6 +25,7 @@
 #include <libgnome/gnome-defs.h>
 #include <time.h>
 #include <glib.h>
+#include "calobj.h"
 
 BEGIN_GNOME_DECLS
 
@@ -53,7 +54,8 @@ typedef enum {
 
 void cal_obj_uid_list_free (GList *list);
 
-
+char *ical_object_to_string (iCalObject *ico);
+iCalObject *string_to_ical_object (char *);
 
 END_GNOME_DECLS