X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit%2Fical_subst.c;fp=webcit%2Fical_subst.c;h=db30c668971f0292cd48bb3ab814c6eda431b095;hp=bd44e42b96fea2efc126a8c9038b99876c894398;hb=c7295725d9b7693cafa84c65890f2f0fe14c333b;hpb=3eacc124cabb1ef5fe94ed9fb8ca35ca95235137

diff --git a/webcit/ical_subst.c b/webcit/ical_subst.c
index bd44e42b9..db30c6689 100644
--- a/webcit/ical_subst.c
+++ b/webcit/ical_subst.c
@@ -558,7 +558,7 @@ InitModule_ICAL_SUBST
 
 
         RegisterIterator("ICAL:CONFLICT", 0, NULL, iterate_FindConflict, 
-                         NULL, NULL, CTX_MIME_ATACH, CTX_ICALCONFLICT, IT_NOFLAG);
+                         NULL, DeleteHash, CTX_MIME_ATACH, CTX_ICALCONFLICT, IT_NOFLAG);
 	RegisterNamespace("ICAL:CONFLICT:MSGID", 0, 1, tmplput_ConflictEventMsgID, NULL, CTX_ICALCONFLICT);
 	RegisterNamespace("ICAL:CONFLICT:EUID", 0, 1, tmplput_ConflictEUID, NULL, CTX_ICALCONFLICT);
 	RegisterNamespace("ICAL:CONFLICT:SUMMARY", 0, 1, tmplput_ConflictSummary, NULL, CTX_ICALCONFLICT);
@@ -567,7 +567,7 @@ InitModule_ICAL_SUBST
 
 	RegisterCTX(CTX_ICALATTENDEE);
         RegisterIterator("ICAL:ATTENDEES", 0, NULL, iterate_get_ical_attendees, 
-                         NULL, NULL, CTX_ICALATTENDEE, CTX_ICAL, IT_NOFLAG);
+                         NULL, DeleteHash, CTX_ICALATTENDEE, CTX_ICAL, IT_NOFLAG);
 	RegisterNamespace("ICAL:ATTENDEE", 1, 2, tmplput_ICalAttendee, NULL, CTX_ICALATTENDEE);
  	RegisterConditional("COND:ICAL:ATTENDEE", 1, cond_ICalAttendeeState, CTX_ICALATTENDEE);
 
@@ -593,28 +593,3 @@ ServerShutdownModule_ICAL
 {
 	DeleteHash(&IcalComponentMap);
 }
-
-
-
-/*
-			if (is_update) {
-				snprintf(conflict_message, sizeof conflict_message,
-					 _("This is an update of '%s' which is already in your calendar."), conflict_name);
-			}
-			else {
-				snprintf(conflict_message, sizeof conflict_message,
-					 _("This event would conflict with '%s' which is already in your calendar."), conflict_name);
-			}
-
-			StrBufAppendPrintf(Target, "<dt>%s",
-					   (is_update ?
-					    _("Update:") :
-					    _("CONFLICT:")
-						   )
-				);
-			StrBufAppendPrintf(Target, "</dt><dd>");
-			StrEscAppend(Target, NULL, conflict_message, 0, 0);
-			StrBufAppendPrintf(Target, "</dd>\n");
-			}
-		}
-/*/