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

Merge pull request #1067 from paulfariello/hotfix/omemo-policy

Browse Source 
Always follow OMEMO policy
This commit is contained in:
Michael Vetter 2019-04-17 20:41:20 +02:00 committed by GitHub
commit 4403e667a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/event/server_events.c
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