From bcd19c6d16a3ff6892ad6aa41b68a2f97277239d Mon Sep 17 00:00:00 2001 From: James Booth Date: Mon, 2 Nov 2015 21:05:21 +0000 Subject: [PATCH] Removed ui_swap_wins --- src/command/commands.c | 2 +- src/ui/core.c | 6 ------ src/ui/ui.h | 1 - tests/unittests/ui/stub_ui.c | 4 ---- 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/command/commands.c b/src/command/commands.c index a5718eb8..8d0aeac9 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -875,7 +875,7 @@ cmd_wins(ProfWin *window, const char *const command, gchar **args) } else if (source_win == 10 || target_win == 10) { cons_show("Window 10 does not exist"); } else if (source_win != target_win) { - gboolean swapped = ui_swap_wins(source_win, target_win); + gboolean swapped = wins_swap(source_win, target_win); if (swapped) { cons_show("Swapped windows %d <-> %d", source_win, target_win); } else { diff --git a/src/ui/core.c b/src/ui/core.c index 74b6bbc1..9681a455 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -751,12 +751,6 @@ ui_prune_wins(void) } } -gboolean -ui_swap_wins(int source_win, int target_win) -{ - return wins_swap(source_win, target_win); -} - win_type_t ui_win_type(int index) { diff --git a/src/ui/ui.h b/src/ui/ui.h index 0c4ee8eb..27026620 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -127,7 +127,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); -gboolean ui_swap_wins(int source_win, int target_win); 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); diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c index bc1c08b4..b8414315 100644 --- a/tests/unittests/ui/stub_ui.c +++ b/tests/unittests/ui/stub_ui.c @@ -280,10 +280,6 @@ void ui_show_all_room_rosters(void) {} void ui_hide_all_room_rosters(void) {} void ui_prune_wins(void) {} -gboolean ui_swap_wins(int source_win, int target_win) -{ - return FALSE; -} void ui_handle_login_account_success(ProfAccount *account, int secured) {} void ui_update_presence(const resource_presence_t resource_presence,