diff options
| author | Federico Mena Quintero <federico@helixcode.com> | 2000-03-02 14:52:53 +0800 |
|---|---|---|
| committer | Federico Mena Quintero <federico@src.gnome.org> | 2000-03-02 14:52:53 +0800 |
| commit | da08b761fb9afadf60b4705ec8a310f83f031188 (patch) | |
| tree | 6ce27e59d4f7c2f18ab0c67bf72c3eee2900d85e /calendar | |
| parent | 6bddc9bd17ae7dc82a379967efb2eb28814a10e8 (diff) | |
| download | gsoc2013-evolution-da08b761fb9afadf60b4705ec8a310f83f031188.tar.gz gsoc2013-evolution-da08b761fb9afadf60b4705ec8a310f83f031188.tar.zst gsoc2013-evolution-da08b761fb9afadf60b4705ec8a310f83f031188.zip | |
At this point the calendar client and personal calendar server files were
2000-03-02 Federico Mena Quintero <federico@helixcode.com>
At this point the calendar client and personal calendar server
files were moved to the idl/, cal-client/, and pcs/ directories.
* idl/Makefile.am: New file.
* cal-client/Makefile.am: New file. Moved the libcal-client stuff
from calendar/Makefile.am to here.
* pcs/Makefile.am: New file. Moved the tlacuache stuff from
calendar/Makefile.am to here.
* Makefile.am (SUBDIRS): Added the idl and cal-client directories.
* calendar.h: Removed the references to cal-backend.h and its
stuff. This file is going away soon!
* icalendar.c: #include <config.h>. Also, we don't need to
include cal-backend.h or gnome.h.
* icalendar.h: Protect from multiple inclusions.
svn path=/trunk/; revision=2011
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 10 | ||||
| -rw-r--r-- | calendar/cal-client/Makefile.am | 7 | ||||
| -rw-r--r-- | calendar/calendar.h | 2 | ||||
| -rw-r--r-- | calendar/gui/calendar.h | 2 | ||||
| -rw-r--r-- | calendar/icalendar.c | 3 | ||||
| -rw-r--r-- | calendar/icalendar.h | 11 |
6 files changed, 23 insertions, 12 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index d2003c3169..b3a7f6dc73 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,4 +1,4 @@ -2000-03-01 Federico Mena Quintero <federico@helixcode.com> +2000-03-02 Federico Mena Quintero <federico@helixcode.com> At this point the calendar client and personal calendar server files were moved to the idl/, cal-client/, and pcs/ directories. @@ -13,6 +13,14 @@ * Makefile.am (SUBDIRS): Added the idl and cal-client directories. + * calendar.h: Removed the references to cal-backend.h and its + stuff. This file is going away soon! + + * icalendar.c: #include <config.h>. Also, we don't need to + include cal-backend.h or gnome.h. + + * icalendar.h: Protect from multiple inclusions. + 2000-03-01 Federico Mena Quintero <federico@helixcode.com> * Makefile.am: Use the gnome-config flags for orbit-idl. diff --git a/calendar/cal-client/Makefile.am b/calendar/cal-client/Makefile.am index cbe5993dec..71e914c5fb 100644 --- a/calendar/cal-client/Makefile.am +++ b/calendar/cal-client/Makefile.am @@ -43,6 +43,7 @@ libcal_clientinclude_HEADERS = \ # # client-test program +# noinst_PROGRAMS = client-test @@ -53,7 +54,7 @@ client_test_INCLUDES = \ $(INCLUDES) \ -DG_LOG_DOMAIN=\"client-test\" -client_test_LDADD = \ - $(BONOBO_VFS_GNOME_LIBS) \ - ../libversit/libversit.la \ +client_test_LDADD = \ + $(BONOBO_VFS_GNOME_LIBS) \ + $(top_builddir)/libversit/libversit.la \ libcal-client.la diff --git a/calendar/calendar.h b/calendar/calendar.h index 4e077ddd58..23fa65c094 100644 --- a/calendar/calendar.h +++ b/calendar/calendar.h @@ -2,7 +2,6 @@ #define CALENDAR_H #include "calobj.h" -#include "cal-backend.h" BEGIN_GNOME_DECLS @@ -12,7 +11,6 @@ typedef struct { /* backing store for this calendar object */ char *filename; - CalendarFormat format; /* The list of events; todo's and journal entries */ GList *events; diff --git a/calendar/gui/calendar.h b/calendar/gui/calendar.h index 4e077ddd58..23fa65c094 100644 --- a/calendar/gui/calendar.h +++ b/calendar/gui/calendar.h @@ -2,7 +2,6 @@ #define CALENDAR_H #include "calobj.h" -#include "cal-backend.h" BEGIN_GNOME_DECLS @@ -12,7 +11,6 @@ typedef struct { /* backing store for this calendar object */ char *filename; - CalendarFormat format; /* The list of events; todo's and journal entries */ GList *events; diff --git a/calendar/icalendar.c b/calendar/icalendar.c index 30d91f6858..af4f2ca83b 100644 --- a/calendar/icalendar.c +++ b/calendar/icalendar.c @@ -10,11 +10,10 @@ * */ -#include <gnome.h> +#include <config.h> #include <unistd.h> #include <sys/stat.h> #include "icalendar.h" -#include "cal-backend.h" static time_t icaltime_to_timet (struct icaltimetype* i); static CalendarAlarm* parse_alarm (icalproperty *prop); diff --git a/calendar/icalendar.h b/calendar/icalendar.h index 84993bc3ae..09bfa06fad 100644 --- a/calendar/icalendar.h +++ b/calendar/icalendar.h @@ -1,6 +1,13 @@ -#include "ical.h" +#ifndef ICALENDAR_H +#define ICALENDAR_H + +#include <ical.h> #include "calobj.h" -#include "cal-backend.h" + iCalObject *ical_object_create_from_icalcomponent (icalcomponent* comp); + + + +#endif |