Fixed merge
This commit is contained in:
@@ -1122,7 +1122,7 @@ ui_handle_otr_error(const char * const barejid, const char * const message)
|
|||||||
{
|
{
|
||||||
ProfChatWin *chatwin = wins_get_chat(barejid);
|
ProfChatWin *chatwin = wins_get_chat(barejid);
|
||||||
if (chatwin) {
|
if (chatwin) {
|
||||||
win_save_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(message);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user