From daca5db8be138b20b809e7049c996706b060f708 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Fri, 20 Jul 2012 15:09:52 +0200 Subject: [PATCH] Message composing: add text plain downmix for VIEW_JSON_LIST - we recently changed the view to 'VIEW_JSON_LIST' for rendering the message list. so VIEW_JSON_LIST basicaly equals VIEW_MAILBOX and has to trigger plain texts too. - tnx Max Kellermann for pointing me to this. --- webcit/messages.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/webcit/messages.c b/webcit/messages.c index 884041118..4a8a3d691 100644 --- a/webcit/messages.c +++ b/webcit/messages.c @@ -903,7 +903,9 @@ void post_mime_to_server(void) { } /* Only do multipart/alternative for mailboxes. BBS and Wiki rooms don't need it. */ - if (WC->CurRoom.view == VIEW_MAILBOX) { + if ((WCC->CurRoom.view == VIEW_MAILBOX) || + (WCC->CurRoom.view == VIEW_JSON_LIST)) + { include_text_alt = 1; } @@ -1129,7 +1131,7 @@ void post_message(void) serv_printf("Cc: %s", ChrPtr(Cc)); serv_printf("Bcc: %s", ChrPtr(Bcc)); } else { - serv_printf("X-Citadel-Room: %s", ChrPtr(WC->CurRoom.name)); + serv_printf("X-Citadel-Room: %s", ChrPtr(WCC->CurRoom.name)); } } post_mime_to_server(); @@ -1574,7 +1576,7 @@ void display_enter(void) to_rcpt = from; from = NULL; if ( (StrLength(node) > 0) - && (strcasecmp(ChrPtr(node), ChrPtr(WC->serv_info->serv_nodename))) + && (strcasecmp(ChrPtr(node), ChrPtr(WCC->serv_info->serv_nodename))) ) { StrBufAppendBufPlain(to_rcpt, HKEY(" @ "), 0); StrBufAppendBuf(to_rcpt, node, 0); -- 2.30.2