track movement of calobj.[ch]

svn path=/trunk/; revision=2086

6 files changed, 6 insertions, 12 deletions

diff --git a/calendar/gui/alarm-notify/alarm.c b/calendar/gui/alarm-notify/alarm.c
index b720d7a4e5..88bf5a6848 100644
--- a/calendar/gui/alarm-notify/alarm.c
+++ b/calendar/gui/alarm-notify/alarm.c
@@ -11,7 +11,7 @@
 #include <fcntl.h>
 #include <signal.h>
 #include <sys/time.h>
-#include "pcs/calobj.h"
+#include "cal-util/calobj.h"
 #include "alarm.h"
 
 /* The pipes used to notify about an alarm */
diff --git a/calendar/gui/alarm-notify/alarm.h b/calendar/gui/alarm-notify/alarm.h
index 6bb5c1afa5..c1dbd9cb61 100644
--- a/calendar/gui/alarm-notify/alarm.h
+++ b/calendar/gui/alarm-notify/alarm.h
@@ -2,7 +2,7 @@
 #define ALARM_H
 
 #include <time.h>
-#include "pcs/calobj.h"
+#include "cal-util/calobj.h"
 
 typedef void (*AlarmFunction)(time_t time, CalendarAlarm *which, void *closuse);
 
diff --git a/calendar/gui/alarm.c b/calendar/gui/alarm.c
index b720d7a4e5..88bf5a6848 100644
--- a/calendar/gui/alarm.c
+++ b/calendar/gui/alarm.c
@@ -11,7 +11,7 @@
 #include <fcntl.h>
 #include <signal.h>
 #include <sys/time.h>
-#include "pcs/calobj.h"
+#include "cal-util/calobj.h"
 #include "alarm.h"
 
 /* The pipes used to notify about an alarm */
diff --git a/calendar/gui/alarm.h b/calendar/gui/alarm.h
index 6bb5c1afa5..c1dbd9cb61 100644
--- a/calendar/gui/alarm.h
+++ b/calendar/gui/alarm.h
@@ -2,7 +2,7 @@
 #define ALARM_H
 
 #include <time.h>
-#include "pcs/calobj.h"
+#include "cal-util/calobj.h"
 
 typedef void (*AlarmFunction)(time_t time, CalendarAlarm *which, void *closuse);
 
diff --git a/calendar/gui/calendar.h b/calendar/gui/calendar.h
index 83a5f67c84..27223b4f67 100644
--- a/calendar/gui/calendar.h
+++ b/calendar/gui/calendar.h
@@ -1,7 +1,7 @@
 #ifndef CALENDAR_H
 #define CALENDAR_H
 
-#include "pcs/calobj.h"
+#include "cal-util/calobj.h"
 
 BEGIN_GNOME_DECLS
 
diff --git a/calendar/gui/eventedit.h b/calendar/gui/eventedit.h
index 9411d4ac7a..4d605892dd 100644
--- a/calendar/gui/eventedit.h
+++ b/calendar/gui/eventedit.h
@@ -9,7 +9,6 @@
 #define EVENT_EDITOR_H
 
 #include "gnome-cal.h"
-#include "alarm.h"
 #include <libgnomeui/gnome-dialog.h>
 
 BEGIN_GNOME_DECLS
@@ -58,12 +57,7 @@ typedef struct {
 	GtkWidget  *recur_ex_clist;
 	
 	/* The associated ical object */
-	iCalObject *ical; /* FIX ME -- get rid of this */
-
-	CalendarAlarmUI dalarmui;
-	CalendarAlarmUI aalarmui;
-	CalendarAlarmUI palarmui;
-	CalendarAlarmUI malarmui;
+	iCalObject *ical;
 
 	/* The calendar owner of this event */
         GnomeCalendar *gnome_cal;