From eb56098b269f20693d0982bbb5c0426af96d83ff Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Thu, 24 Sep 2009 20:58:38 +0000 Subject: [PATCH] * Use HKEY() where appropriate --- citadel/modules/chat/serv_chat.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/citadel/modules/chat/serv_chat.c b/citadel/modules/chat/serv_chat.c index 0012a569c..555998ef9 100644 --- a/citadel/modules/chat/serv_chat.c +++ b/citadel/modules/chat/serv_chat.c @@ -111,20 +111,20 @@ void log_instant_message(struct CitContext *me, struct CitContext *them, char *m this_im->conversation = NewStrBuf(); this_im->next = imlist; imlist = this_im; - StrBufAppendBufPlain(this_im->conversation, + StrBufAppendBufPlain(this_im->conversation, HKEY( "Content-type: text/html\r\n" "Content-transfer-encoding: 7bit\r\n" "\r\n" - "\r\n", - -1, 0); + "\r\n" + ), 0); } this_im->lastmsg = time(NULL); /* Touch the timestamp so we know when to flush */ - StrBufAppendBufPlain(this_im->conversation, "

", -1, 0); + StrBufAppendBufPlain(this_im->conversation, HKEY("

"), 0); StrBufAppendBufPlain(this_im->conversation, me->user.fullname, -1, 0); - StrBufAppendBufPlain(this_im->conversation, ": ", -1, 0); + StrBufAppendBufPlain(this_im->conversation, HKEY(": "), 0); StrEscAppend(this_im->conversation, NULL, msgtext, 0, 0); - StrBufAppendBufPlain(this_im->conversation, "

\r\n", -1, 0); + StrBufAppendBufPlain(this_im->conversation, HKEY("

\r\n"), 0); end_critical_section(S_IM_LOGS); } @@ -259,13 +259,11 @@ void do_chat_listing(int allflag) } GenerateRoomDisplay(roomname, ccptr, CC); - if ((CC->user.axlevel < 6) - && (!IsEmptyStr(ccptr->fake_roomname))) { + if ((CC->user.axlevel < 6) && (!IsEmptyStr(ccptr->fake_roomname))) { strcpy(roomname, ccptr->fake_roomname); } - if ((ccptr->cs_flags & CS_CHAT) - && ((ccptr->cs_flags & CS_STEALTH) == 0)) { + if ((ccptr->cs_flags & CS_CHAT) && ((ccptr->cs_flags & CS_STEALTH) == 0)) { if ((allflag == 0) || (allflag == 1)) { cprintf(":| %-25s <%s>:\n", (ccptr->fake_username[0]) ? ccptr->fake_username : ccptr->curr_user, @@ -846,10 +844,10 @@ void flush_individual_conversation(struct imlog *im) { long msgnum = 0; char roomname[ROOMNAMELEN]; - StrBufAppendBufPlain(im->conversation, + StrBufAppendBufPlain(im->conversation, HKEY( "\r\n" - "\r\n", - -1, 0 + "\r\n" + ), 0 ); msg = malloc(sizeof(struct CtdlMessage)); -- 2.39.2