Merge branch 'master' into readline

This commit is contained in:
James Booth
2015-02-01 20:47:28 +00:00
5 changed files with 10 additions and 6 deletions

View File

@@ -1402,8 +1402,8 @@ ui_outgoing_chat_msg(const char * const from, const char * const barejid,
// create new window
if (window == NULL) {
window = wins_new_chat(barejid);
ProfChatWin *chatwin = (ProfChatWin*)window;
#ifdef HAVE_LIBOTR
ProfChatWin *chatwin = (ProfChatWin*)window;
if (otr_is_secure(barejid)) {
chatwin->is_otr = TRUE;
}