aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-09-22 19:45:54 -04:00
Code

Renamed ui_outgoing_chat_msg -> chatwin_outgoing_msg

Browse Source
This commit is contained in:
James Booth 2015-10-27 23:20:03 +00:00
parent af1124f28f
commit e7148bf82d
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/event/client_events.c
View File

@ -94,14 +94,14 @@ cl_ev_send_msg(ProfChatWin *chatwin, const char *const msg)
if (chatwin->pgp_send) {
char *id = message_send_chat_pgp(chatwin->barejid, msg);
chat_log_pgp_msg_out(chatwin->barejid, msg);
ui_outgoing_chat_msg(chatwin, msg, id, PROF_MSG_PGP);
chatwin_outgoing_msg(chatwin, msg, id, PROF_MSG_PGP);
free(id);
} else {
gboolean handled = otr_on_message_send(chatwin, msg);
if (!handled) {
char *id = message_send_chat(chatwin->barejid, msg);
chat_log_msg_out(chatwin->barejid, msg);
ui_outgoing_chat_msg(chatwin, msg, id, PROF_MSG_PLAIN);
chatwin_outgoing_msg(chatwin, msg, id, PROF_MSG_PLAIN);
free(id);
}
}
@ -116,7 +116,7 @@ cl_ev_send_msg(ProfChatWin *chatwin, const char *const msg)
if (!handled) {
char *id = message_send_chat(chatwin->barejid, msg);
chat_log_msg_out(chatwin->barejid, msg);
ui_outgoing_chat_msg(chatwin, msg, id, PROF_MSG_PLAIN);
chatwin_outgoing_msg(chatwin, msg, id, PROF_MSG_PLAIN);
free(id);
}
return;
@ -129,12 +129,12 @@ cl_ev_send_msg(ProfChatWin *chatwin, const char *const msg)
if (chatwin->pgp_send) {
char *id = message_send_chat_pgp(chatwin->barejid, msg);
chat_log_pgp_msg_out(chatwin->barejid, msg);
ui_outgoing_chat_msg(chatwin, msg, id, PROF_MSG_PGP);
chatwin_outgoing_msg(chatwin, msg, id, PROF_MSG_PGP);
free(id);
} else {
char *id = message_send_chat(chatwin->barejid, msg);
chat_log_msg_out(chatwin->barejid, msg);
ui_outgoing_chat_msg(chatwin, msg, id, PROF_MSG_PLAIN);
chatwin_outgoing_msg(chatwin, msg, id, PROF_MSG_PLAIN);
free(id);
}
return;
@ -146,7 +146,7 @@ cl_ev_send_msg(ProfChatWin *chatwin, const char *const msg)
#ifndef HAVE_LIBGPGME
char *id = message_send_chat(chatwin->barejid, msg);
chat_log_msg_out(chatwin->barejid, msg);
ui_outgoing_chat_msg(chatwin, msg, id, PROF_MSG_PLAIN);
chatwin_outgoing_msg(chatwin, msg, id, PROF_MSG_PLAIN);
free(id);
return;
#endif

4
src/otr/otr.c
View File

@ -331,7 +331,7 @@ otr_on_message_send(ProfChatWin *chatwin, const char *const message)
if (encrypted) {
id = message_send_chat_otr(chatwin->barejid, encrypted);
chat_log_otr_msg_out(chatwin->barejid, message);
ui_outgoing_chat_msg(chatwin, message, id, PROF_MSG_OTR);
chatwin_outgoing_msg(chatwin, message, id, PROF_MSG_OTR);
otr_free_message(encrypted);
free(id);
return TRUE;
@ -351,7 +351,7 @@ otr_on_message_send(ProfChatWin *chatwin, const char *const message)
if (policy == PROF_OTRPOLICY_OPPORTUNISTIC) {
char *otr_tagged_msg = otr_tag_message(message);
id = message_send_chat_otr(chatwin->barejid, otr_tagged_msg);
ui_outgoing_chat_msg(chatwin, message, id, PROF_MSG_PLAIN);
chatwin_outgoing_msg(chatwin, message, id, PROF_MSG_PLAIN);
chat_log_msg_out(chatwin->barejid, message);
free(otr_tagged_msg);
free(id);

2
src/ui/chatwin.c
View File

@ -271,7 +271,7 @@ chatwin_incoming_msg(ProfChatWin *chatwin, const char *const resource, const cha
}
void
ui_outgoing_chat_msg(ProfChatWin *chatwin, const char *const message, char *id, prof_enc_t enc_mode)
chatwin_outgoing_msg(ProfChatWin *chatwin, const char *const message, char *id, prof_enc_t enc_mode)
{
char enc_char = '-';
if (enc_mode == PROF_MSG_OTR) {

2
src/ui/ui.h
View File

@ -106,7 +106,7 @@ void chatwin_receipt_received(ProfChatWin *chatwin, const char *const id);
void ui_disconnected(void);
void chatwin_recipient_gone(ProfChatWin *chatwin);
void ui_outgoing_chat_msg(ProfChatWin *chatwin, const char *const message, char *id, prof_enc_t enc_mode);
void chatwin_outgoing_msg(ProfChatWin *chatwin, const char *const message, char *id, prof_enc_t enc_mode);
void ui_outgoing_chat_msg_carbon(const char *const barejid, const char *const message);
void ui_outgoing_private_msg(ProfPrivateWin *privwin, const char *const message);

2
tests/unittests/ui/stub_ui.c
View File

@ -181,7 +181,7 @@ void ui_incoming_private_msg(const char * const fulljid, const char * const mess
void ui_disconnected(void) {}
void chatwin_recipient_gone(ProfChatWin *chatwin) {}
void ui_outgoing_chat_msg(ProfChatWin *chatwin, const char * const message, char *id, prof_enc_t enc_mode) {}
void chatwin_outgoing_msg(ProfChatWin *chatwin, const char * const message, char *id, prof_enc_t enc_mode) {}
void ui_outgoing_chat_msg_carbon(const char * const barejid, const char * const message) {}
void ui_outgoing_private_msg(ProfPrivateWin *privwin, const char * const message) {}