From 022d20bbdc69cc4831317ac3092310b86d8ca7d8 Mon Sep 17 00:00:00 2001 From: James Booth Date: Mon, 2 Nov 2015 21:21:52 +0000 Subject: [PATCH] Removed ui_clear_win --- src/command/commands.c | 2 +- src/ui/core.c | 6 ------ src/ui/ui.h | 2 +- src/ui/window.h | 2 -- tests/unittests/ui/stub_ui.c | 3 +-- 5 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/command/commands.c b/src/command/commands.c index 8d0aeac9..7c456a9b 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -3530,7 +3530,7 @@ cmd_tiny(ProfWin *window, const char *const command, gchar **args) gboolean cmd_clear(ProfWin *window, const char *const command, gchar **args) { - ui_clear_win(window); + win_clear(window); return TRUE; } diff --git a/src/ui/core.c b/src/ui/core.c index 5221f592..f7621ff3 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -1074,12 +1074,6 @@ ui_clear_win_title(void) printf("%c]0;%c", '\033', '\007'); } -void -ui_clear_win(ProfWin *window) -{ - win_clear(window); -} - void ui_goodbye_title(void) { diff --git a/src/ui/ui.h b/src/ui/ui.h index d3f5b91b..b52badfd 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -124,7 +124,6 @@ void ui_handle_software_version_error(const char *const roomjid, const char *con void ui_show_software_version(const char *const jid, const char *const presence, const char *const name, const char *const version, const char *const os); void ui_prune_wins(void); -void ui_clear_win(ProfWin *window); void ui_auto_away(char *message, gint time, resource_presence_t res_presence); void ui_handle_login_account_success(ProfAccount *account, int secured); void ui_update_presence(const resource_presence_t resource_presence, const char *const message, const char *const show); @@ -332,6 +331,7 @@ void win_show_contact(ProfWin *window, PContact contact); void win_show_info(ProfWin *window, PContact contact); void win_println(ProfWin *window, int pad, const char *const message); void win_vprintln_ch(ProfWin *window, char ch, const char *const message, ...); +void win_clear(ProfWin *window); // desktop notifications void notifier_initialise(void); diff --git a/src/ui/window.h b/src/ui/window.h index 07191fc0..643cdf7b 100644 --- a/src/ui/window.h +++ b/src/ui/window.h @@ -72,8 +72,6 @@ void win_mark_received(ProfWin *window, const char *const id); gboolean win_has_active_subwin(ProfWin *window); -void win_clear(ProfWin *window); - void win_page_up(ProfWin *window); void win_page_down(ProfWin *window); void win_sub_page_down(ProfWin *window); diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c index fbb060b2..6e205d14 100644 --- a/tests/unittests/ui/stub_ui.c +++ b/tests/unittests/ui/stub_ui.c @@ -139,8 +139,6 @@ int ui_win_unread(int index) return 0; } -void ui_clear_win(ProfWin *window) {} - char * ui_ask_password(void) { return mock_ptr_type(char *); @@ -505,6 +503,7 @@ void win_show_contact(ProfWin *window, PContact contact) {} void win_show_info(ProfWin *window, PContact contact) {} void win_println(ProfWin *window, int pad, const char * const message) {} void win_vprintln_ch(ProfWin *window, char ch, const char *const message, ...) {} +void win_clear(ProfWin *window) {} // desktop notifier actions void notifier_uninit(void) {}