devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

Merge branch 'master' into pgp

Browse Source
This commit is contained in:
James Booth
2015-04-30 23:38:28 +01:00
parent a3a4b6267b e11e55e31a
commit 0bd642edf8
7 changed files with 30 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/command/commands.c
View File

@@ -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.");