about summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2015-04-27 22:34:06 +0100
committerJames Booth <boothj5@gmail.com>2015-04-27 22:34:06 +0100
commitf219302f069e1db38ae656f1d8cca931756f388c (patch)
tree9879e9cfc6e8d5f400782387e73e09b6c8c5c7f4 /src
parentbc9e6b79cdc246f7e97f6ddff7ea81474a698b05 (diff)
downloadprofani-tty-f219302f069e1db38ae656f1d8cca931756f388c.tar.gz
Renamed incoming otr message
Diffstat (limited to 'src')
-rw-r--r--src/event/server_events.c12
1 files 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);