From e11e55e31abced2f4e7fa332298485562adaf1ef Mon Sep 17 00:00:00 2001 From: James Booth Date: Thu, 30 Apr 2015 22:43:08 +0100 Subject: Move current win check to event, removed next and prev win functions --- src/command/commands.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/command') diff --git a/src/command/commands.c b/src/command/commands.c index ad8c276c..62dcb927 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -727,9 +727,7 @@ cmd_win(gchar **args, struct cmd_help_t help) if (!window) { cons_show("Window %d does not exist.", num); } else { - if (!wins_is_current(window)) { - ui_ev_focus_win(window); - } + ui_ev_focus_win(window); } return TRUE; @@ -1337,9 +1335,7 @@ cmd_msg(gchar **args, struct cmd_help_t help) if (!chatwin) { chatwin = ui_ev_new_chat_win(barejid); } - if (!wins_is_current((ProfWin*)chatwin)) { - ui_ev_focus_win((ProfWin*)chatwin); - } + ui_ev_focus_win((ProfWin*)chatwin); if (msg) { cl_ev_send_msg(chatwin, msg); @@ -4175,9 +4171,7 @@ cmd_otr(gchar **args, struct cmd_help_t help) if (!chatwin) { chatwin = ui_ev_new_chat_win(barejid); } - if (!wins_is_current((ProfWin*)chatwin)) { - ui_ev_focus_win((ProfWin*)chatwin); - } + ui_ev_focus_win((ProfWin*)chatwin); if (ui_current_win_is_otr()) { ui_current_print_formatted_line('!', 0, "You are already in an OTR session."); -- cgit 1.4.1-2-gfad0