diff options
| author | Federico Mena Quintero <federico@helixcode.com> | 2000-03-10 05:14:19 +0800 |
|---|---|---|
| committer | Federico Mena Quintero <federico@src.gnome.org> | 2000-03-10 05:14:19 +0800 |
| commit | acd3bd04ead065cd90f41c51f11f9cee5361c747 (patch) | |
| tree | f13ef90ac1d9de24488ff02a4b35b6952fa14038 /calendar/conduits | |
| parent | 1e7ab47d26dc1bf69ed79273f593c867c358f728 (diff) | |
| download | gsoc2013-evolution-acd3bd04ead065cd90f41c51f11f9cee5361c747.tar gsoc2013-evolution-acd3bd04ead065cd90f41c51f11f9cee5361c747.tar.gz gsoc2013-evolution-acd3bd04ead065cd90f41c51f11f9cee5361c747.tar.bz2 gsoc2013-evolution-acd3bd04ead065cd90f41c51f11f9cee5361c747.tar.lz gsoc2013-evolution-acd3bd04ead065cd90f41c51f11f9cee5361c747.tar.xz gsoc2013-evolution-acd3bd04ead065cd90f41c51f11f9cee5361c747.tar.zst gsoc2013-evolution-acd3bd04ead065cd90f41c51f11f9cee5361c747.zip | |
Random #ifdefs to make it build, although this file is going away.
2000-03-09 Federico Mena Quintero <federico@helixcode.com>
* gui/calendar.c: Random #ifdefs to make it build, although this
file is going away.
* gui/Makefile.am: Removed referenes to calobj.[ch] and timeutil.[ch].
* gui/calendar-conduit.c: Fixup includes.
* gui/calendar-conduit.h: Fixup includes.
svn path=/trunk/; revision=2092
Diffstat (limited to 'calendar/conduits')
| -rw-r--r-- | calendar/conduits/calendar/calendar-conduit.c | 22 | ||||
| -rw-r--r-- | calendar/conduits/calendar/calendar-conduit.h | 11 |
2 files changed, 10 insertions, 23 deletions
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c index 8d9ba6002d..8aa0e23a3f 100644 --- a/calendar/conduits/calendar/calendar-conduit.c +++ b/calendar/conduits/calendar/calendar-conduit.c @@ -1,33 +1,23 @@ /* $Id$ */ -#include <glib.h> -#include <gnome.h> - -#include <pi-source.h> -#include <pi-socket.h> -#include <pi-file.h> -#include <pi-dlp.h> -#include <pi-version.h> - +#include <config.h> #include <sys/stat.h> -#include <sys/types.h> #include <utime.h> #include <unistd.h> #include <pwd.h> #include <signal.h> #include <errno.h> - +#include <pi-source.h> +#include <pi-socket.h> +#include <pi-file.h> +#include <pi-dlp.h> #include <libgnorba/gnorba.h> #include <libgnorba/gnome-factory.h> - +#include <pi-version.h> #include <gpilotd/gnome-pilot-conduit.h> #include <gpilotd/gnome-pilot-conduit-standard-abs.h> #include "GnomeCal.h" -#include "calobj.h" -/*#include "calendar.h" DELETE */ -#include "timeutil.h" - #include "calendar-conduit.h" int debug_alarms = 0; /* needed to satisfy some other part of gncal */ diff --git a/calendar/conduits/calendar/calendar-conduit.h b/calendar/conduits/calendar/calendar-conduit.h index 711609e96a..fa8c151d4c 100644 --- a/calendar/conduits/calendar/calendar-conduit.h +++ b/calendar/conduits/calendar/calendar-conduit.h @@ -6,16 +6,13 @@ #include <sys/types.h> #include <fcntl.h> #include <unistd.h> -#include <pi-datebook.h> #include <gnome.h> - -#include "GnomeCal.h" -#include "calobj.h" -#include "calendar.h" -#include "timeutil.h" - +#include <pi-datebook.h> #include <gpilotd/gnome-pilot-conduit.h> #include <gpilotd/gnome-pilot-conduit-standard-abs.h> +#include <cal-util/calobj.h> +#include <cal-util/timeutil.h> +#include "GnomeCal.h" /* This is the local record structure for the GnomeCal conduit. */ typedef struct _GCalLocalRecord GCalLocalRecord; |