New main program that uses our new datatypes and objects.

1998-04-02  Miguel de Icaza  <miguel@nuclecu.unam.mx>

	* main.c: New main program that uses our new datatypes and
	objects.

	* calendar.c (calendar_load_from_vobject, calendar_load):
	Implement loading of vCalendar objects and vCalendar files.

	* calobj.c (ical_object_create_from_vobject): Implement loading of
	vCalendar event and todo objects.

	* timeutil.c (isodate_from_time_t): New function.

	* gnome-cal.c, gnome-cal.h: Implement a toplevel widget, derived
	from GnomeApp.  It holds all of the day views and arbitrates the
	display.

svn path=/trunk/; revision=93

1 files changed, 5 insertions, 2 deletions

diff --git a/calendar/calobj.h b/calendar/calobj.h
index d5f6db0ae0..85f88dccd9 100644
--- a/calendar/calobj.h
+++ b/calendar/calobj.h
@@ -8,6 +8,7 @@
 #define CALOBJ_H
 
 #include <libgnome/libgnome.h>
+#include "versit/vcc.h"
 
 BEGIN_GNOME_DECLS
 
@@ -89,14 +90,16 @@ typedef struct {
 	char          *url;
 	time_t        recurid;
 
-	/* VALARM objects are always inside another object, never alone */
-	CalendarAlarm *alarm;
+	CalendarAlarm *dalarm;
+	CalendarAlarm *aalarm;
 } iCalObject;
 
 iCalObject *ical_new (char *comment, char *organizer, char *summary);
 iCalObject *ical_object_new (void);
 void        ical_object_destroy (iCalObject *ico);
+iCalObject *ical_object_create_from_vobject (VObject *obj, const char *object_name);
 
 END_GNOME_DECLS
 
 #endif
+