aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui/alarm.c
diff options
context:
space:
mode:
Diffstat (limited to 'calendar/gui/alarm.c')
-rw-r--r--calendar/gui/alarm.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/calendar/gui/alarm.c b/calendar/gui/alarm.c
index 826effcbf0..b720d7a4e5 100644
--- a/calendar/gui/alarm.c
+++ b/calendar/gui/alarm.c
@@ -11,8 +11,8 @@
#include <fcntl.h>
#include <signal.h>
#include <sys/time.h>
+#include "pcs/calobj.h"
#include "alarm.h"
-#include "cal-util/alarm-enums.h"
/* The pipes used to notify about an alarm */
int alarm_pipes [2];
@@ -26,7 +26,7 @@ typedef struct {
time_t activation_time;
AlarmFunction fn;
void *closure;
- CalendarAlarmUI *alarm;
+ CalendarAlarm *alarm;
} AlarmRecord;
enum DebugAction {
@@ -36,7 +36,7 @@ enum DebugAction {
};
void debug_alarm (AlarmRecord* ar, enum DebugAction action);
-void calendar_notify (time_t time, CalendarAlarmUI *which, void *data);
+void calendar_notify (time_t time, CalendarAlarm *which, void *data);
extern int debug_alarms;
/*
@@ -125,11 +125,11 @@ alarm_compare_by_time (gconstpointer a, gconstpointer b)
* Returns TRUE if the alarm was scheduled.
*/
gboolean
-alarm_add (CalendarAlarmUI *alarm, AlarmFunction fn, void *closure)
+alarm_add (CalendarAlarm *alarm, AlarmFunction fn, void *closure)
{
time_t now = time (NULL);
AlarmRecord *ar;
- time_t alarm_time = cal_client_alarm_get_trigger (alarm->alarm_handle);
+ time_t alarm_time = alarm->trigger;
ar = g_new0 (AlarmRecord, 1);
ar->activation_time = alarm_time;
@@ -215,7 +215,7 @@ void
debug_alarm (AlarmRecord* ar, enum DebugAction action)
{
time_t now = time (NULL);
- /* iCalObject *ico = ar->closure; */
+ iCalObject *ico = ar->closure;
printf ("%s", ctime(&now));
switch (action) {
case ALARM_ADDED:
@@ -230,8 +230,8 @@ debug_alarm (AlarmRecord* ar, enum DebugAction action)
}
if (ar->fn!=&calendar_notify) return;
- /* printf ("--- Summary: %s\n", ico->summary);*/
- switch (cal_client_alarm_get_type (ar->alarm->alarm_handle)) {
+ printf ("--- Summary: %s\n", ico->summary);
+ switch (ar->alarm->type) {
case ALARM_MAIL:
printf ("--- Type: Mail\n");
break;
@@ -247,3 +247,4 @@ debug_alarm (AlarmRecord* ar, enum DebugAction action)
}
}
+