better merge of summary/description when doing ical_from_remote

        * calendar-conduit.c: better merge of summary/description
        when doing ical_from_remote (update_record), also handles
        import from gnomecal to pilot better, and on both ways, repeat
        events are much better now.

svn path=/trunk/; revision=1253

1 files changed, 8 insertions, 0 deletions

diff --git a/calendar/calendar-conduit.h b/calendar/calendar-conduit.h
index c34457acc5..86b38cc802 100644
--- a/calendar/calendar-conduit.h
+++ b/calendar/calendar-conduit.h
@@ -9,6 +9,14 @@
 #include <pi-datebook.h>
 #include <gnome.h>
 
+#include "GnomeCal.h"
+#include "calobj.h"
+#include "calendar.h"
+#include "timeutil.h"
+
+#include <gpilotd/gnome-pilot-conduit.h>
+#include <gpilotd/gnome-pilot-conduit-standard-abs.h>
+
 #define CALLOCALRECORD(s) ((CalLocalRecord*)(s))
 typedef struct _CalLocalRecord CalLocalRecord;