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

Added otr_tag_message, removed commands.c dependency on libotr

Browse Source
This commit is contained in:
James Booth
2015-03-16 21:41:35 +00:00
parent ec57c72fb4
commit 11966d39b0
4 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/command/commands.c
View File

@@ -39,9 +39,6 @@
#include <errno.h>
#include <assert.h>
#include <glib.h>
#ifdef HAVE_LIBOTR
#include <libotr/proto.h>
#endif
#include "chat_session.h"
#include "command/commands.h"
@@ -1377,16 +1374,12 @@ cmd_msg(gchar **args, struct cmd_help_t help)
cons_show_error("Failed to send message. Please check OTR policy");
return TRUE;
} else if (policy == PROF_OTRPOLICY_OPPORTUNISTIC) {
GString *otr_message = g_string_new(msg);
g_string_append(otr_message, OTRL_MESSAGE_TAG_BASE);
g_string_append(otr_message, OTRL_MESSAGE_TAG_V2);
char *id = message_send_chat_encrypted(barejid, otr_message->str);
char *otr_tagged_msg = otr_tag_message(msg);
char *id = message_send_chat_encrypted(barejid, otr_tagged_msg);
ui_outgoing_chat_msg(barejid, msg, id);
chat_log_msg_out(barejid, msg);
free(id);
g_string_free(otr_message, TRUE);
free(otr_tagged_msg);
} else {
_send_chat_message(barejid, msg);
}