mirror of
https://github.com/profanity-im/profanity.git
synced 2025-02-02 15:08:15 -05:00
Merge branch 'master' into pgp
This commit is contained in:
commit
65c0a87f97
@ -417,11 +417,6 @@ ui_incoming_msg(const char * const barejid, const char * const resource, const c
|
|||||||
if (chatwin == NULL) {
|
if (chatwin == NULL) {
|
||||||
ProfWin *window = wins_new_chat(barejid);
|
ProfWin *window = wins_new_chat(barejid);
|
||||||
chatwin = (ProfChatWin*)window;
|
chatwin = (ProfChatWin*)window;
|
||||||
#ifdef HAVE_LIBOTR
|
|
||||||
if (otr_is_secure(barejid)) {
|
|
||||||
chatwin->is_otr = TRUE;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
win_created = TRUE;
|
win_created = TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user