1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00

Merge branch 'master' into openpgp

This commit is contained in:
James Booth 2015-05-25 21:16:51 +01:00
commit 06fe9bec37

View File

@ -1046,7 +1046,7 @@ ui_handle_otr_error(const char * const barejid, const char * const message)
if (chatwin) { if (chatwin) {
win_print((ProfWin*)chatwin, '!', NULL, 0, THEME_ERROR, "", message); win_print((ProfWin*)chatwin, '!', NULL, 0, THEME_ERROR, "", message);
} else { } else {
cons_show_error(message); cons_show_error("%s - %s", barejid, message);
} }
} }