aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Use static functions in cmd_msg

Browse Source
This commit is contained in:
James Booth 2015-03-16 01:48:12 +00:00
parent d50754aac6
commit ec57c72fb4
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/command/commands.c
View File

@ -1370,20 +1370,9 @@ cmd_msg(gchar **args, struct cmd_help_t help)
if (msg != NULL) { if (msg != NULL) {
#ifdef HAVE_LIBOTR #ifdef HAVE_LIBOTR
if (otr_is_secure(barejid)) { if (otr_is_secure(barejid)) {
char *encrypted = otr_encrypt_message(barejid, msg); _send_otr_chat_message(barejid, msg);
if (encrypted != NULL) {
char *id = message_send_chat_encrypted(barejid, encrypted);
otr_free_message(encrypted);
ui_outgoing_chat_msg(barejid, msg, id);
chat_log_otr_msg_out(barejid, msg);
free(id);
} else {
cons_show_error("Failed to encrypt and send message,");
}
} else { } else {
prof_otrpolicy_t policy = otr_get_policy(barejid); prof_otrpolicy_t policy = otr_get_policy(barejid);
char *id = NULL;
if (policy == PROF_OTRPOLICY_ALWAYS) { if (policy == PROF_OTRPOLICY_ALWAYS) {
cons_show_error("Failed to send message. Please check OTR policy"); cons_show_error("Failed to send message. Please check OTR policy");
return TRUE; return TRUE;
@ -1391,22 +1380,20 @@ cmd_msg(gchar **args, struct cmd_help_t help)
GString *otr_message = g_string_new(msg); GString *otr_message = g_string_new(msg);
g_string_append(otr_message, OTRL_MESSAGE_TAG_BASE); g_string_append(otr_message, OTRL_MESSAGE_TAG_BASE);
g_string_append(otr_message, OTRL_MESSAGE_TAG_V2); g_string_append(otr_message, OTRL_MESSAGE_TAG_V2);
id = message_send_chat_encrypted(barejid, otr_message->str);
char *id = message_send_chat_encrypted(barejid, otr_message->str);
ui_outgoing_chat_msg(barejid, msg, id);
chat_log_msg_out(barejid, msg);
free(id);
g_string_free(otr_message, TRUE); g_string_free(otr_message, TRUE);
} else { } else {
id = message_send_chat(barejid, msg); _send_chat_message(barejid, msg);
} }
ui_outgoing_chat_msg(barejid, msg, id);
chat_log_msg_out(barejid, msg);
free(id);
} }
return TRUE; return TRUE;
#else #else
char *id = message_send_chat(barejid, msg); _send_chat_message(barejid, msg);
ui_outgoing_chat_msg(barejid, msg, id);
chat_log_msg_out(barejid, msg);
free(id);
return TRUE; return TRUE;
#endif #endif