Merge branch 'master' into xep-0184

2015-03-15 01:27:09 +00:00
parent 125719673b 49022068ef
commit 8c552e8a70
3 changed files with 64 additions and 6 deletions
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -1117,6 +1117,17 @@ ui_otr_authetication_waiting(const char * const barejid)
    }
 }

+void
+ui_handle_otr_error(const char * const barejid, const char * const message)
+{
+    ProfChatWin *chatwin = wins_get_chat(barejid);
+    if (chatwin) {
+        win_save_print((ProfWin*)chatwin, '!', NULL, 0, THEME_ERROR, "", message);
+    } else {
+        cons_show_error(message);
+    }
+}
+
 void
 ui_trust(const char * const barejid)
 {