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

diff --git a/calendar/cal-client/cal-client.h b/calendar/cal-client/cal-client.h
index 7b5c66e510..5738856c99 100644
--- a/calendar/cal-client/cal-client.h
+++ b/calendar/cal-client/cal-client.h
@@ -24,7 +24,7 @@
 
 #include <libgnome/gnome-defs.h>
 #include <gtk/gtkobject.h>
-#include "cal-util.h"
+#include "cal-util/cal-util.h"
 
 BEGIN_GNOME_DECLS
 
@@ -51,6 +51,9 @@ struct _CalClient {
 
 	/* Private data */
 	gpointer priv;
+
+	void *corba_server;
+	gchar *filename;
 };
 
 struct _CalClientClass {