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

Follow OMEMO policy even when opening window on message and carbon reception

This should close #1052
This commit is contained in:
Paul Fariello 2019-04-17 15:53:44 +02:00
parent 3d3eabb63f
commit db55e01dce

View File

@ -521,6 +521,13 @@ sv_ev_incoming_message(char *barejid, char *resource, char *message, char *pgp_m
ProfWin *window = wins_new_chat(barejid); ProfWin *window = wins_new_chat(barejid);
chatwin = (ProfChatWin*)window; chatwin = (ProfChatWin*)window;
new_win = TRUE; new_win = TRUE;
#ifdef HAVE_OMEMO
if (omemo_automatic_start(barejid)) {
omemo_start_session(barejid);
chatwin->is_omemo = TRUE;
}
#endif
} }
// OTR suported, PGP supported, OMEMO unsupported // OTR suported, PGP supported, OMEMO unsupported
@ -657,6 +664,13 @@ sv_ev_incoming_carbon(char *barejid, char *resource, char *message, char *pgp_me
ProfWin *window = wins_new_chat(barejid); ProfWin *window = wins_new_chat(barejid);
chatwin = (ProfChatWin*)window; chatwin = (ProfChatWin*)window;
new_win = TRUE; new_win = TRUE;
#ifdef HAVE_OMEMO
if (omemo_automatic_start(barejid)) {
omemo_start_session(barejid);
chatwin->is_omemo = TRUE;
}
#endif
} }
#ifdef HAVE_LIBGPGME #ifdef HAVE_LIBGPGME