X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserver%2Fmodules%2Fcalendar%2Fserv_calendar.c;h=13cb1394ee61f980931749bab0e89a427efa1458;hb=6ce0d284993145869a896e5790e9b8250203f1c7;hp=643212968f3976a3d02e5296eafbd39e87edaecc;hpb=a9ecccd192191f8595ebe974be6790ccfe421978;p=citadel.git

diff --git a/citadel/server/modules/calendar/serv_calendar.c b/citadel/server/modules/calendar/serv_calendar.c
index 643212968..13cb1394e 100644
--- a/citadel/server/modules/calendar/serv_calendar.c
+++ b/citadel/server/modules/calendar/serv_calendar.c
@@ -454,8 +454,9 @@ void ical_merge_attendee_reply(icalcomponent *event, icalcomponent *reply) {
 	// recurse through subcomponents until we find one.
 	if (icalcomponent_isa(event) != ICAL_VEVENT_COMPONENT) {
 		for (c = icalcomponent_get_first_component(event, ICAL_VEVENT_COMPONENT);
-		    c != NULL;
-		    c = icalcomponent_get_next_component(event, ICAL_VEVENT_COMPONENT) ) {
+			c != NULL;
+			c = icalcomponent_get_next_component(event, ICAL_VEVENT_COMPONENT)
+		) {
 			ical_merge_attendee_reply(c, reply);
 		}
 		return;
@@ -464,8 +465,9 @@ void ical_merge_attendee_reply(icalcomponent *event, icalcomponent *reply) {
 	// Now do the same thing with the reply.
 	if (icalcomponent_isa(reply) != ICAL_VEVENT_COMPONENT) {
 		for (c = icalcomponent_get_first_component(reply, ICAL_VEVENT_COMPONENT);
-		    c != NULL;
-		    c = icalcomponent_get_next_component(reply, ICAL_VEVENT_COMPONENT) ) {
+			c != NULL;
+			c = icalcomponent_get_next_component(reply, ICAL_VEVENT_COMPONENT)
+		) {
 			ical_merge_attendee_reply(event, c);
 		}
 		return;
@@ -490,9 +492,7 @@ STARTOVER:
 			e = icalproperty_get_attendee(e_attendee);
 			r = icalproperty_get_attendee(r_attendee);
 
-			if ((e != NULL) && 
-			    (r != NULL) && 
-			    !strcasecmp(e, r)) {
+			if ((e != NULL) && (r != NULL) && !strcasecmp(e, r)) {
 				// ...and if they do, remove the attendee from the event
 				// and replace it with the attendee from the reply.  (The
 				// reply's copy will have the same address, but an updated