1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-06-30 21:55:24 +00:00

Merge branch 'master' into pgp

This commit is contained in:
James Booth 2015-04-21 20:56:47 +01:00
commit 65c0a87f97

View File

@ -417,11 +417,6 @@ ui_incoming_msg(const char * const barejid, const char * const resource, const c
if (chatwin == NULL) {
ProfWin *window = wins_new_chat(barejid);
chatwin = (ProfChatWin*)window;
#ifdef HAVE_LIBOTR
if (otr_is_secure(barejid)) {
chatwin->is_otr = TRUE;
}
#endif
win_created = TRUE;
}