diff options
Diffstat (limited to 'calendar/gui')
-rw-r--r-- | calendar/gui/Makefile.am | 20 | ||||
-rw-r--r-- | calendar/gui/calendar-conduit.c | 22 | ||||
-rw-r--r-- | calendar/gui/calendar-conduit.h | 11 | ||||
-rw-r--r-- | calendar/gui/calendar.c | 11 |
4 files changed, 20 insertions, 44 deletions
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 9398f6dc94..2366c37ce9 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -1,5 +1,3 @@ - - idldir = $(datadir)/idl idl_DATA = \ GnomeCal.idl @@ -95,25 +93,13 @@ gnomecal_SOURCES = \ main.c \ main.h - -# calobj.c \ -# calobj.h \ -# icalendar.c \ -# icalendar.h \ -# timeutil.c \ -# timeutil.h \ - calendar_pilot_sync_SOURCES = \ GnomeCal-common.c \ GnomeCal-stubs.c \ alarm.c \ calendar-pilot-sync.c \ - calobj.c \ - calobj.h \ calendar.c \ - calendar.h \ - timeutil.c \ - timeutil.h + calendar.h LINK_FLAGS = \ $(BONOBO_VFS_GNOME_LIBS) \ @@ -139,10 +125,8 @@ libcalendar_conduit_la_SOURCES = \ GnomeCal-stubs.c \ calendar-conduit.h \ calendar-conduit.c \ - calobj.c \ alarm.c \ - calendar.c \ - timeutil.c + calendar.c libcalendar_conduit_la_LDFLAGS = \ -rpath $(libdir) diff --git a/calendar/gui/calendar-conduit.c b/calendar/gui/calendar-conduit.c index 8d9ba6002d..8aa0e23a3f 100644 --- a/calendar/gui/calendar-conduit.c +++ b/calendar/gui/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/gui/calendar-conduit.h b/calendar/gui/calendar-conduit.h index 711609e96a..fa8c151d4c 100644 --- a/calendar/gui/calendar-conduit.h +++ b/calendar/gui/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; diff --git a/calendar/gui/calendar.c b/calendar/gui/calendar.c index 776f38452d..74c8ddaab9 100644 --- a/calendar/gui/calendar.c +++ b/calendar/gui/calendar.c @@ -17,11 +17,10 @@ #include <config.h> #include <unistd.h> #include <sys/stat.h> +#include <cal-util/timeutil.h> #include "calendar.h" #include "alarm.h" -#include "timeutil.h" #include "libversit/vcc.h" -#include "icalendar.h" #ifdef HAVE_TZNAME extern char *tzname[2]; @@ -41,10 +40,13 @@ calendar_new (char *title,CalendarNewOptions options) cal = g_new0 (Calendar, 1); cal->title = g_strdup (title); + +#if 0 if (options & CALENDAR_USE_ICAL) cal->format = CAL_ICAL; else cal->format = CAL_VCAL; +#endif if ((calendar_day_begin == 0) || (calendar_day_end == 0)) calendar_set_day (); @@ -325,15 +327,17 @@ calendar_load (Calendar *cal, char *fname) cal->file_time = s.st_mtime; calendar_set_day (); - +#if 0 switch (cal->format) { case CAL_VCAL: +#endif vcal = Parse_MIME_FromFileName (fname); if (!vcal) return "Could not load the calendar"; calendar_load_from_vobject (cal, vcal); cleanVObject (vcal); cleanStrTbl (); +#if 0 break; /* case CAL_ICAL: @@ -343,6 +347,7 @@ calendar_load (Calendar *cal, char *fname) default: return "Unknown calendar format"; } +#endif return NULL; } |