moved CalendarFormat type def here

	* cal-backend.h: moved CalendarFormat type def here

	* cal-backend.c (cal_backend_load): if extension suggests
	an ical file, attempt to load an iCal file.
	(cal_get_type_from_filename): returns CAL_ICAL if file
	extension is 'ics' or 'ifb', else returns CAL_VCAL
	(icalendar_calendar_load): moved this here from
	icalendar.c because it needs to call the static function
	add_object.

svn path=/trunk/; revision=1831

1 files changed, 3 insertions, 3 deletions

diff --git a/calendar/calendar.c b/calendar/calendar.c
index 0a690f344b..172ef3390e 100644
--- a/calendar/calendar.c
+++ b/calendar/calendar.c
@@ -21,6 +21,7 @@
 #include "alarm.h"
 #include "timeutil.h"
 #include "../libversit/vcc.h"
+#include "icalendar.h"
 
 #ifdef HAVE_TZNAME
 extern char *tzname[2];
@@ -334,12 +335,11 @@ calendar_load (Calendar *cal, char *fname)
 		cleanVObject (vcal);
 		cleanStrTbl ();
 		break;
-#ifdef HAVE_LIBICAL
-		hi;
+		/*
 	case CAL_ICAL:
 		icalendar_calendar_load (cal, fname);
 		break;
-#endif
+		*/
 	default:
 		return "Unknown calendar format";
 	}