X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fcalendar%2Fserv_calendar.c;h=55d64d9ff02e52553dec05e41c0dc3615359f5ef;hb=882ff5a53c3b4e440520a073cf07dc60b2671876;hp=939bb95516a3d98d4865c6c6e0c61ef1a1e317f3;hpb=7f9d699a7f73ac27bcbde2075a8758744036fb98;p=citadel.git

diff --git a/citadel/modules/calendar/serv_calendar.c b/citadel/modules/calendar/serv_calendar.c
index 939bb9551..55d64d9ff 100644
--- a/citadel/modules/calendar/serv_calendar.c
+++ b/citadel/modules/calendar/serv_calendar.c
@@ -3,7 +3,7 @@
  * room on a Citadel server.  It handles iCalendar objects using the
  * iTIP protocol.  See RFCs 2445 and 2446.
  *
- * Copyright (c) 1987-2020 by the citadel.org team
+ * Copyright (c) 1987-2021 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3.
@@ -145,7 +145,7 @@ void ical_write_to_cal(struct ctdluser *u, icalcomponent *cal) {
 		CM_SetAsFieldSB(msg, eMesageText, &MsgBody);
 	
 		/* Now write the data */
-		CtdlSubmitMsg(msg, NULL, "", QP_EADDR);
+		CtdlSubmitMsg(msg, NULL, "");
 		CM_Free(msg);
 	}
 
@@ -171,13 +171,13 @@ void ical_send_a_reply(icalcomponent *request, char *action) {
 	icalproperty *summary = NULL;
 	char summary_string[SIZ];
 	icalproperty *me_attend = NULL;
-	recptypes *recp = NULL;
+	struct recptypes *recp = NULL;
 	icalparameter *partstat = NULL;
 	char *serialized_reply = NULL;
 	char *reply_message_text = NULL;
 	const char *ch;
 	struct CtdlMessage *msg = NULL;
-	recptypes *valid = NULL;
+	struct recptypes *valid = NULL;
 
 	*organizer_string = '\0';
 	strcpy(summary_string, "Calendar item");
@@ -297,7 +297,7 @@ void ical_send_a_reply(icalcomponent *request, char *action) {
 	
 		if (msg != NULL) {
 			valid = validate_recipients(organizer_string, NULL, 0);
-			CtdlSubmitMsg(msg, valid, "", QP_EADDR);
+			CtdlSubmitMsg(msg, valid, "");
 			CM_Free(msg);
 			free_recipients(valid);
 		}
@@ -669,7 +669,7 @@ int ical_update_my_calendar_with_reply(icalcomponent *cal) {
 	
 		if (msg != NULL) {
 			CIT_ICAL->avoid_sending_invitations = 1;
-			CtdlSubmitMsg(msg, NULL, roomname, QP_EADDR);
+			CtdlSubmitMsg(msg, NULL, roomname);
 			CM_Free(msg);
 			CIT_ICAL->avoid_sending_invitations = 0;
 		}
@@ -1407,7 +1407,7 @@ void ical_freebusy(char *who) {
 	icalcomponent *encaps = NULL;
 	icalcomponent *fb = NULL;
 	int found_user = (-1);
-	recptypes *recp = NULL;
+	struct recptypes *recp = NULL;
 	char buf[256];
 	char host[256];
 	char type[256];
@@ -1960,7 +1960,7 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal)
 	icalcomponent *encaps = NULL;
 	char *request_message_text = NULL;
 	struct CtdlMessage *msg = NULL;
-	recptypes *valid = NULL;
+	struct recptypes *valid = NULL;
 	char attendees_string[SIZ];
 	int num_attendees = 0;
 	char this_attendee[256];
@@ -2169,7 +2169,7 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal)
 	
 		if (msg != NULL) {
 			valid = validate_recipients(attendees_string, NULL, 0);
-			CtdlSubmitMsg(msg, valid, "", QP_EADDR);
+			CtdlSubmitMsg(msg, valid, "");
 			CM_Free(msg);
 			free_recipients(valid);
 		}
@@ -2349,7 +2349,7 @@ void ical_obj_beforesave_backend(char *name, char *filename, char *partnum,
  * If the message is being saved, we also set various message header fields
  * using data found in the iCalendar object.
  */
-int ical_obj_beforesave(struct CtdlMessage *msg, recptypes *recp)
+int ical_obj_beforesave(struct CtdlMessage *msg, struct recptypes *recp)
 {
 	/* First determine if this is a calendar or tasks room */
 	if (  (CC->room.QRdefaultview != VIEW_CALENDAR)
@@ -2416,7 +2416,7 @@ void ical_obj_aftersave_backend(char *name, char *filename, char *partnum,
  * (This will start back end tasks such as automatic generation of invitations,
  * if such actions are appropriate.)
  */
-int ical_obj_aftersave(struct CtdlMessage *msg, recptypes *recp)
+int ical_obj_aftersave(struct CtdlMessage *msg, struct recptypes *recp)
 {
 	char roomname[ROOMNAMELEN];
 
@@ -2532,11 +2532,6 @@ void ical_fixed_output(char *ptr, int len) {
 }
 
 
-void serv_calendar_destroy(void) {
-	icaltimezone_free_builtin_timezones();
-}
-
-
 /*
  * Register this module with the Citadel server.
  */
@@ -2565,7 +2560,6 @@ CTDL_MODULE_INIT(calendar)
 		CtdlRegisterSessionHook(ical_session_shutdown, EVT_STOP, PRIO_STOP + 80);
 		CtdlRegisterFixedOutputHook("text/calendar", ical_fixed_output);
 		CtdlRegisterFixedOutputHook("application/ics", ical_fixed_output);
-		CtdlRegisterCleanupHook(serv_calendar_destroy);
 	}
 
 	/* return our module name for the log */