diff options
| author | James Booth <boothj5@gmail.com> | 2015-04-30 23:38:28 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-04-30 23:38:28 +0100 |
| commit | 0bd642edf8d943485871082c2678b0662e1dd5db (patch) | |
| tree | b5ed09aceb749904eaa546333130c804f9f87f66 /src/command | |
| parent | a3a4b6267b02d69761e64403aa131553c946fa96 (diff) | |
| parent | e11e55e31abced2f4e7fa332298485562adaf1ef (diff) | |
| download | profani-tty-0bd642edf8d943485871082c2678b0662e1dd5db.tar.gz | |
Merge branch 'master' into pgp
Diffstat (limited to 'src/command')
| -rw-r--r-- | src/command/commands.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/command/commands.c b/src/command/commands.c index 51c6ceb4..f3a247e8 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -738,9 +738,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; @@ -1348,9 +1346,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); @@ -4241,9 +4237,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."); |