Fix default landing mechanism

[citadel.git] / webcit / ical_subst.c

diff --git a/webcit/ical_subst.c b/webcit/ical_subst.c
index db30c668971f0292cd48bb3ab814c6eda431b095..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);