I18n: refresh po-files

[citadel.git] / webcit / ical_subst.c

diff --git a/webcit/ical_subst.c b/webcit/ical_subst.c
index bd44e42b96fea2efc126a8c9038b99876c894398..5f2393ff9cb95e8604504051feeeef2bca335065 100644 (file)
--- a/webcit/ical_subst.c
+++ b/webcit/ical_subst.c
@@ -325,7 +325,8 @@ void render_MIME_ICS_TPL(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundChar
                      0,
                      SuperTP.Tokens);
        FlushStrBuf(Mime->Data);
-       DoTemplate(HKEY("ical_attachment_display"), Mime->Data, &SubTP);
+///    DoTemplate(HKEY("ical_attachment_display"), Mime->Data, &SubTP);
+       DoTemplate(HKEY("ical_edit"), Mime->Data, &SubTP);
 
        /*/ cal_process_object(Mime->Data, cal, 0, Mime->msgnum, ChrPtr(Mime->PartNum)); */
 
@@ -417,7 +418,7 @@ HashList *iterate_FindConflict(StrBuf *Target, WCTemplputParams *TP)
                                Done = 1;
                        }
                        else {
-                               Conflict = (CalendarConflict *) malloc(sizeof(CalendarConflict *));
+                               Conflict = (CalendarConflict *) malloc(sizeof(CalendarConflict));
                                Conflict->conflict_event_uid = NewStrBufPlain(NULL, StrLength(Line));
                                Conflict->conflict_event_summary = NewStrBufPlain(NULL, StrLength(Line));
 
@@ -432,7 +433,8 @@ HashList *iterate_FindConflict(StrBuf *Target, WCTemplputParams *TP)
                                Pos = NULL;
                        }
        }
-       syslog(9, "...done.\n");
+       FreeStrBuf(&Line);
+       syslog(LOG_DEBUG, "...done.\n");
        return Conflicts;
 }
 
@@ -547,10 +549,10 @@ InitModule_ICAL_SUBST
 (void)
 {
        RegisterCTX(CTX_ICAL);
-//*
+/*
        RegisterMimeRenderer(HKEY("text/calendar"), render_MIME_ICS_TPL, 1, 501);
        RegisterMimeRenderer(HKEY("application/ics"), render_MIME_ICS_TPL, 1, 500);
-//*/
+*/
 
        CreateIcalComponendKindLookup ();
        RegisterConditional("COND:ICAL:PROPERTY", 1, cond_ICalHaveItem, CTX_ICAL);
@@ -558,7 +560,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 +569,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 +595,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");
-                       }
-               }
-/*/