From f219302f069e1db38ae656f1d8cca931756f388c Mon Sep 17 00:00:00 2001 From: James Booth Date: Mon, 27 Apr 2015 22:34:06 +0100 Subject: Renamed incoming otr message --- src/event/server_events.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/event/server_events.c b/src/event/server_events.c index bd4634e5..cc76ed17 100644 --- a/src/event/server_events.c +++ b/src/event/server_events.c @@ -322,7 +322,7 @@ srv_incoming_message(char *barejid, char *resource, char *message) { #ifdef HAVE_LIBOTR gboolean was_decrypted = FALSE; - char *newmessage; + char *otr_message; prof_otrpolicy_t policy = otr_get_policy(barejid); char *whitespace_base = strstr(message,OTRL_MESSAGE_TAG_BASE); @@ -344,10 +344,10 @@ srv_incoming_message(char *barejid, char *resource, char *message) } } } - newmessage = otr_decrypt_message(barejid, message, &was_decrypted); + otr_message = otr_decrypt_message(barejid, message, &was_decrypted); // internal OTR message - if (newmessage == NULL) { + if (otr_message == NULL) { return; } @@ -357,9 +357,9 @@ srv_incoming_message(char *barejid, char *resource, char *message) message_send_chat_encrypted(barejid, otr_query_message); } - ui_incoming_msg(barejid, resource, newmessage, NULL); - chat_log_otr_msg_in(barejid, newmessage, was_decrypted); - otr_free_message(newmessage); + ui_incoming_msg(barejid, resource, otr_message, NULL); + chat_log_otr_msg_in(barejid, otr_message, was_decrypted); + otr_free_message(otr_message); #else ui_incoming_msg(barejid, resource, message, NULL); chat_log_msg_in(barejid, message); -- cgit 1.4.1-2-gfad0