aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-02-02 15:08:15 -05:00
Code

Merge remote-tracking branch 'pasis/pgp-without-otr-fix'

Browse Source
This commit is contained in:
James Booth 2015-06-23 23:32:41 +01:00
commit d89a9862b1
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/event/server_events.c
View File

@ -261,9 +261,8 @@ sv_ev_incoming_message(char *barejid, char *resource, char *message, char *enc_m
// OTR unsupported, PGP supported
#ifndef HAVE_LIBOTR
#ifdef HAVE_LIBGPGME
prof_enc_t enc_mode = chatwin->enc_mode;
if (enc_message) {
char *decrypted = p_gpg_decrypt(jid->barejid, enc_message);
char *decrypted = p_gpg_decrypt(barejid, enc_message);
if (decrypted) {
ui_incoming_msg(chatwin, resource, decrypted, NULL, new_win);
chat_log_pgp_msg_in(barejid, decrypted);