X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsmtpqueue.c;h=b5c750a311a1b4106a9072b8ae20f3e51db4996a;hb=HEAD;hp=9013567e70e21cf6e466c35647deeef636d5746b;hpb=b39d860713ddd390339211be8d398c4d4b6680ba;p=citadel.git

diff --git a/webcit/smtpqueue.c b/webcit/smtpqueue.c
index 9013567e7..b5c750a31 100644
--- a/webcit/smtpqueue.c
+++ b/webcit/smtpqueue.c
@@ -296,19 +296,20 @@ void QItem_Handle_Attempted(OneQueItem *Item, StrBuf *Line, const char **Pos)
 
 
 
-
-
-
-
-void render_QUEUE(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
+void render_QUEUE(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharset)
 {
+	wc_mime_attachment *Mime = CTX(CTX_MIME_ATACH);
 	WCTemplputParams SubTP;
+	OneQueItem* Context;
 
-	memset(&SubTP, 0, sizeof(WCTemplputParams));
-	SubTP.Filter.ContextType = CTX_MAILQITEM;
-	SubTP.Context = DeserializeQueueItem(Mime->Data, Mime->msgnum);
-	DoTemplate(HKEY("view_mailq_message"),NULL, &SubTP);
-	FreeQueItem ((OneQueItem**)&SubTP.Context);
+	Context = DeserializeQueueItem(Mime->Data, Mime->msgnum);
+	StackContext(TP, &SubTP, Context, CTX_MAILQITEM, 0, TP->Tokens);
+	{
+		DoTemplate(HKEY("view_mailq_message"), NULL, &SubTP);
+	}
+	UnStackContext(&SubTP);
+
+	FreeQueItem (&Context);
 }
 
 void
@@ -372,7 +373,7 @@ int qview_LoadMsgFromServer(SharedMessageStatus *Stat,
 	const StrBuf *Mime;
 
         /* Not (yet?) needed here? calview *c = (calview *) *ViewSpecific; */
-	read_message(WCC->WBuf, HKEY("view_mailq_message_bearer"), Msg->msgnum, NULL, &Mime);
+	read_message(WCC->WBuf, HKEY("view_mailq_message_bearer"), Msg->msgnum, NULL, &Mime, NULL);
 
         return 0;
 }
@@ -385,6 +386,7 @@ int qview_RenderView_or_Tail(SharedMessageStatus *Stat,
 	wcsession *WCC = WC;
 	WCTemplputParams SubTP;
 
+	memset(&SubTP, 0, sizeof(WCTemplputParams));
 	if (yesbstr("ListOnly"))
 		DoTemplate(HKEY("view_mailq_footer_listonly"),NULL, &SubTP);
 	else
@@ -446,6 +448,7 @@ InitModule_SMTP_QUEUE
 		NULL,
 		qview_LoadMsgFromServer,
 		qview_RenderView_or_Tail,
-		qview_Cleanup);
+		qview_Cleanup,
+		NULL);
 
 }