back out recent commit, and remove calendar.[ch] from Makefile.am

svn path=/trunk/; revision=2083

1 files changed, 5 insertions, 18 deletions

diff --git a/calendar/gui/alarm-notify/alarm.h b/calendar/gui/alarm-notify/alarm.h
index 7e16952240..6bb5c1afa5 100644
--- a/calendar/gui/alarm-notify/alarm.h
+++ b/calendar/gui/alarm-notify/alarm.h
@@ -2,25 +2,12 @@
 #define ALARM_H
 
 #include <time.h>
-#include "cal-client/cal-client-alarm.h"
+#include "pcs/calobj.h"
 
-typedef struct {
-  	/* Widgets */
-	void   *w_count;      /* A GtkEntry */
-	void   *w_enabled;    /* A GtkChecButton */
-	void   *w_timesel;    /* A GtkMenu */
-	void   *w_entry;      /* A GnomeEntryFile/GtkEntry for PROGRAM/MAIL */
-	void   *w_label;
+typedef void (*AlarmFunction)(time_t time, CalendarAlarm *which, void *closuse);
 
-        AlarmHandle alarm_handle; /* something that hooks to the server */
-} CalendarAlarmUI;
-
-typedef void (*AlarmFunction) (time_t time,
-			       CalendarAlarmUI *which,
-			       void *closuse);
-
-void     alarm_init  (void);
-gboolean alarm_add   (CalendarAlarmUI *alarm, AlarmFunction fn, void *closure);
-int      alarm_kill  (void *closure);
+void      alarm_init    (void);
+gboolean  alarm_add     (CalendarAlarm *alarm, AlarmFunction fn, void *closure);
+int       alarm_kill    (void *closure);
 
 #endif