devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-22 11:56:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of encrypted carbons

Browse Source
This commit is contained in:
Paul Fariello
2019-06-21 13:49:17 +02:00
parent 3bba3d9812
commit db8f32c049
4 changed files with 63 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ui/chatwin.c
View File

@@ -329,20 +329,20 @@ chatwin_outgoing_msg(ProfChatWin *chatwin, const char *const message, char *id,
}
void
chatwin_outgoing_carbon(ProfChatWin *chatwin, const char *const message, prof_enc_t enc_mode)
chatwin_outgoing_carbon(ProfChatWin *chatwin, ProfMessage *message)
{
assert(chatwin != NULL);
char enc_char = '-';
if (enc_mode == PROF_MSG_ENC_PGP) {
if (message->enc == PROF_MSG_ENC_PGP) {
enc_char = prefs_get_pgp_char();
} else if (enc_mode == PROF_MSG_ENC_OMEMO) {
} else if (message->enc == PROF_MSG_ENC_OMEMO) {
enc_char = prefs_get_omemo_char();
}
ProfWin *window = (ProfWin*)chatwin;
win_print_outgoing(window, enc_char, "%s", message);
win_print_outgoing(window, enc_char, "%s", message->plain);
int num = wins_get_num(window);
status_bar_active(num, WIN_CHAT, chatwin->barejid);
}

2
src/ui/ui.h
View File

@@ -125,7 +125,7 @@ void chatwin_receipt_received(ProfChatWin *chatwin, const char *const id);
void chatwin_recipient_gone(ProfChatWin *chatwin);
void chatwin_outgoing_msg(ProfChatWin *chatwin, const char *const message, char *id, prof_enc_t enc_mode,
gboolean request_receipt);
void chatwin_outgoing_carbon(ProfChatWin *chatwin, const char *const message, prof_enc_t enc_mode);
void chatwin_outgoing_carbon(ProfChatWin *chatwin, ProfMessage *message);
void chatwin_contact_online(ProfChatWin *chatwin, Resource *resource, GDateTime *last_activity);
void chatwin_contact_offline(ProfChatWin *chatwin, char *resource, char *status);
char* chatwin_get_string(ProfChatWin *chatwin);