diff options
| author | James Booth <boothj5@gmail.com> | 2015-06-23 23:32:41 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-06-23 23:32:41 +0100 |
| commit | d89a9862b1005fb43e9c35b0888f51356c1a31fc (patch) | |
| tree | c04f860bdf028e3f1087d9069c866138ea3f863d | |
| parent | 358e9d6af0677354fa70fa089124de07d8423eb7 (diff) | |
| parent | 6a73ca1b5281c5a64cb7bc6e70775c5022ab276a (diff) | |
| download | profani-tty-d89a9862b1005fb43e9c35b0888f51356c1a31fc.tar.gz | |
Merge remote-tracking branch 'pasis/pgp-without-otr-fix'
| -rw-r--r-- | src/event/server_events.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/event/server_events.c b/src/event/server_events.c index ff0263cb..f5bc49cf 100644 --- a/src/event/server_events.c +++ b/src/event/server_events.c @@ -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); |