diff options
| author | James Booth <boothj5@gmail.com> | 2015-04-21 20:56:47 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-04-21 20:56:47 +0100 |
| commit | 65c0a87f970ebfb1bb2c11280562c3bd1ba2a26d (patch) | |
| tree | 70a63050c7fe919d97c1496e89dc167489caae5d /src/ui | |
| parent | 9be265591a4e070f26edca7f9bfa3d84c932bd5a (diff) | |
| parent | a4f9661da2b9328b51a81272aecf91129f97cc72 (diff) | |
| download | profani-tty-65c0a87f970ebfb1bb2c11280562c3bd1ba2a26d.tar.gz | |
Merge branch 'master' into pgp
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/core.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/ui/core.c b/src/ui/core.c index e1df5edf..9f8ac806 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -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; } |