diff options
| author | Seth Alves <alves@src.gnome.org> | 2000-02-18 05:30:09 +0800 |
|---|---|---|
| committer | Seth Alves <alves@src.gnome.org> | 2000-02-18 05:30:09 +0800 |
| commit | 4cd07c4e96046f0151528ba585de8d4472e0fbe5 (patch) | |
| tree | 099951cfea95af02f479cd8d5cb3dcec923ef05f /calendar/gui | |
| parent | c975d4ef24b4db28b19faf6d2b1e5d1956fe836c (diff) | |
| download | gsoc2013-evolution-4cd07c4e96046f0151528ba585de8d4472e0fbe5.tar.gz gsoc2013-evolution-4cd07c4e96046f0151528ba585de8d4472e0fbe5.tar.zst gsoc2013-evolution-4cd07c4e96046f0151528ba585de8d4472e0fbe5.zip | |
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
Diffstat (limited to 'calendar/gui')
| -rw-r--r-- | calendar/gui/Makefile.am | 17 | ||||
| -rw-r--r-- | calendar/gui/calendar.c | 6 | ||||
| -rw-r--r-- | calendar/gui/calendar.h | 6 |
3 files changed, 12 insertions, 17 deletions
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 1762bc0bf7..575344e651 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -20,19 +20,14 @@ endif bin_PROGRAMS = gnomecal tlacuache $(extra_pilot_bins) -#if HAVE_LIBICAL -ICAL_INCLUDEDIR = -I../libical/src/libical -ICAL_SOURCES = icalendar.c ICAL_LINK_FLAGS = ../libical/src/libical/libical.a -#endif - INCLUDES = \ -I$(includedir) \ $(GNOME_INCLUDEDIR) \ $(GNOME_CONDUIT_INCLUDEDIR) \ $(PISOCK_INCLUDEDIR) \ - $(ICAL_INCLUDEDIR) \ + -I../libical/src/libical \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" GNOMECAL_CORBA_GENERATED = \ @@ -99,6 +94,8 @@ gnomecal_SOURCES = \ gnome-cal.c \ gnome-cal.h \ goto.c \ + icalendar.c \ + icalendar.h \ layout.c \ layout.h \ main.c \ @@ -118,8 +115,7 @@ gnomecal_SOURCES = \ view-utils.h \ view-utils.c \ year-view.c \ - year-view.h \ - $(ICAL_SOURCES) + year-view.h calendar_pilot_sync_SOURCES = \ GnomeCal-common.c \ @@ -148,6 +144,8 @@ tlacuache_SOURCES = \ cal-util.h \ calobj.c \ calobj.h \ + icalendar.c \ + icalendar.h \ job.c \ job.h \ timeutil.c \ @@ -166,7 +164,8 @@ tlacuache_INCLUDES = \ tlacuache_LDADD = \ $(BONOBO_VFS_GNOME_LIBS) \ - ../libversit/libversit.la + ../libversit/libversit.la \ + $(ICAL_LINK_FLAGS) calendar_pilot_sync_LDADD = \ $(PISOCK_LIBDIR) $(PISOCK_LIBS) \ diff --git a/calendar/gui/calendar.c b/calendar/gui/calendar.c index 0a690f344b..172ef3390e 100644 --- a/calendar/gui/calendar.c +++ b/calendar/gui/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"; } diff --git a/calendar/gui/calendar.h b/calendar/gui/calendar.h index 452281ebd1..4e077ddd58 100644 --- a/calendar/gui/calendar.h +++ b/calendar/gui/calendar.h @@ -2,14 +2,10 @@ #define CALENDAR_H #include "calobj.h" +#include "cal-backend.h" BEGIN_GNOME_DECLS -typedef enum { - CAL_VCAL, - CAL_ICAL -} CalendarFormat; - typedef struct { /* This calendar's title */ char *title; |