1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00

Merge branch 'master' into plugins

This commit is contained in:
James Booth 2014-02-23 01:19:33 +00:00
commit b86164d70b

View File

@ -1069,6 +1069,11 @@ cmd_msg(gchar **args, struct cmd_help_t help)
}
ui_new_chat_win(usr_jid);
#ifdef PROF_HAVE_LIBOTR
if (otr_is_secure(jid)) {
ui_gone_secure(jid, otr_is_trusted(jid));
}
#endif
return TRUE;
}
}