devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

Moved message display logic to sv_ev_incoming_message

Browse Source
This commit is contained in:
James Booth
2015-06-21 18:00:57 +01:00
parent 9b991ae058
commit 8d2d923603
4 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/event/server_events.c
View File

@@ -172,7 +172,13 @@ void
sv_ev_incoming_message(char *barejid, char *resource, char *message)
{
#ifdef HAVE_LIBOTR
otr_on_message_recv(barejid, resource, message);
gboolean decrypted = FALSE;
char *otr_res = otr_on_message_recv(barejid, resource, message, &decrypted);
if (otr_res) {
ui_incoming_msg(barejid, resource, otr_res, NULL);
chat_log_otr_msg_in(barejid, otr_res, decrypted);
otr_free_message(otr_res);
}
#else
ui_incoming_msg(barejid, resource, message, NULL);
chat_log_msg_in(barejid, message);