From 9d075c980597306aec6e167bd84379e8211b4135 Mon Sep 17 00:00:00 2001 From: James Booth Date: Sat, 15 Oct 2016 17:07:15 +0100 Subject: [PATCH] Remove ui_win_error_line --- src/otr/otr.c | 4 ++-- src/ui/core.c | 6 ------ src/ui/ui.h | 1 - tests/unittests/ui/stub_ui.c | 1 - 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/otr/otr.c b/src/otr/otr.c index 158e6d27..295c5f4f 100644 --- a/src/otr/otr.c +++ b/src/otr/otr.c @@ -352,14 +352,14 @@ otr_on_message_send(ProfChatWin *chatwin, const char *const message, gboolean re free(id); return TRUE; } else { - ui_win_error_line((ProfWin*)chatwin, "Failed to encrypt and send message."); + win_printf_line((ProfWin*)chatwin, THEME_ERROR, '-', "%s", "Failed to encrypt and send message."); return TRUE; } } // show error if not secure and policy always if (policy == PROF_OTRPOLICY_ALWAYS) { - ui_win_error_line((ProfWin*)chatwin, "Failed to send message. OTR policy set to: always"); + win_printf_line((ProfWin*)chatwin, THEME_ERROR, '-', "%s", "Failed to send message. OTR policy set to: always"); return TRUE; } diff --git a/src/ui/core.c b/src/ui/core.c index 9347ca66..dd6b56e1 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -757,12 +757,6 @@ ui_current_print_formatted_line(const char show_char, int attrs, const char *con g_string_free(fmt_msg, TRUE); } -void -ui_win_error_line(ProfWin *window, const char *const msg) -{ - win_printf_line(window, THEME_ERROR, '-', "%s", msg); -} - void ui_current_error_line(const char *const msg) { diff --git a/src/ui/ui.h b/src/ui/ui.h index 26febee8..f0302a3a 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -78,7 +78,6 @@ int ui_close_read_wins(void); void ui_current_print_line(const char *const msg, ...); void ui_current_print_formatted_line(const char show_char, int attrs, const char *const msg, ...); void ui_current_error_line(const char *const msg); -void ui_win_error_line(ProfWin *window, const char *const msg); void ui_close_win(int index); int ui_win_unread(int index); char* ui_ask_password(void); diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c index 11f5b516..5b48c9b6 100644 --- a/tests/unittests/ui/stub_ui.c +++ b/tests/unittests/ui/stub_ui.c @@ -126,7 +126,6 @@ void ui_current_print_formatted_line(const char show_char, int attrs, const char } void ui_current_error_line(const char * const msg) {} -void ui_win_error_line(ProfWin *window, const char * const msg) {} void ui_close_win(int index) {}