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/gncal-full-day.c b/calendar/gui/gncal-full-day.c
index c07d9a5710..f402707e73 100644
--- a/calendar/gui/gncal-full-day.c
+++ b/calendar/gui/gncal-full-day.c
@@ -2134,19 +2134,20 @@ gncal_full_day_update (GncalFullDay *fullday, iCalObject *ico, int flags)
 	g_return_if_fail (fullday != NULL);
 	g_return_if_fail (GNCAL_IS_FULL_DAY (fullday));
 
-	if (!fullday->calendar->cal)
+	if (!fullday->calendar->calc)
 		return;
 
 	/* Try to find child that changed */
 
-	for (children = fullday->children; children; children = children->next) {
+	for (children=fullday->children; children; children = children->next) {
 		child = children->data;
 
 		if (child->ico == ico)
 			break;
 	}
 
-	/* If child was found and nothing but the summary changed, we can just paint the child and return */
+	/* If child was found and nothing but the summary changed,
+	   we can just paint the child and return */
 
 	if (children && !(flags & ~CHANGE_SUMMARY)) {
 		child_draw (fullday, child, NULL, NULL, TRUE);
@@ -2157,7 +2158,7 @@ gncal_full_day_update (GncalFullDay *fullday, iCalObject *ico, int flags)
 
 	destroy_children (fullday);
 
-	calendar_iterate (fullday->calendar->cal,
+	calendar_iterate (fullday->calendar,
 			  fullday->lower,
 			  fullday->upper,
 			  fullday_add_children,