Add event parsing for EWS calendars

[lackey] / src / cal.h

diff --git a/src/cal.h b/src/cal.h
index 7d308ec23fe47f60dad9681571407685af30941f..6001542a16410d9d7fcb975baadcb9f9bcf80fe8 100644 (file)
--- a/src/cal.h
+++ b/src/cal.h
@@ -64,5 +64,10 @@ void cal_init(void);
 void cal_load(year_t year, month_t month, day_t day, int days);
 void cal_config(const char *group, const char *name, const char *key, const char *value);
 
+/* Merge functions */
+cal_t *merge_cals(cal_t *a, cal_t *b);
+event_t *merge_events(event_t *a, event_t *b);
+todo_t *merge_todos(todo_t *a, todo_t *b);
+
 /* Event functions */
 event_t *find_event(date_t *target);