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

Removed ui_ev_focus_win

Browse Source
This commit is contained in:
James Booth
2015-10-27 20:40:42 +00:00
parent 795360f446
commit 8087053f49
6 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/command/commands.c
View File

@@ -913,7 +913,7 @@ cmd_win(ProfWin *window, const char *const command, gchar **args)
if (!focuswin) {
cons_show("Window %d does not exist.", num);
} else {
ui_ev_focus_win(focuswin);
ui_switch_win(focuswin);
}
return TRUE;
@@ -1500,7 +1500,7 @@ cmd_msg(ProfWin *window, const char *const command, gchar **args)
if (!privwin) {
privwin = ui_ev_new_private_win(full_jid->str);
}
ui_ev_focus_win((ProfWin*)privwin);
ui_switch_win((ProfWin*)privwin);
if (msg) {
cl_ev_send_priv_msg(privwin, msg);
@@ -1525,7 +1525,7 @@ cmd_msg(ProfWin *window, const char *const command, gchar **args)
if (!chatwin) {
chatwin = ui_ev_new_chat_win(barejid);
}
ui_ev_focus_win((ProfWin*)chatwin);
ui_switch_win((ProfWin*)chatwin);
if (msg) {
cl_ev_send_msg(chatwin, msg);
@@ -2746,7 +2746,7 @@ cmd_form(ProfWin *window, const char *const command, gchar **args)
if (!new_current) {
new_current = wins_get_console();
}
ui_ev_focus_win(new_current);
ui_switch_win(new_current);
wins_close_by_num(num);
}
@@ -3052,7 +3052,7 @@ cmd_room(ProfWin *window, const char *const command, gchar **args)
ProfMucConfWin *confwin = wins_get_muc_conf(mucwin->roomjid);
if (confwin) {
ui_ev_focus_win((ProfWin*)confwin);
ui_switch_win((ProfWin*)confwin);
} else {
iq_request_room_config_form(mucwin->roomjid);
}
@@ -4668,7 +4668,7 @@ cmd_pgp(ProfWin *window, const char *const command, gchar **args)
if (!chatwin) {
chatwin = ui_ev_new_chat_win(barejid);
}
ui_ev_focus_win((ProfWin*)chatwin);
ui_switch_win((ProfWin*)chatwin);
} else {
chatwin = (ProfChatWin*)window;
assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);
@@ -4869,7 +4869,7 @@ cmd_otr(ProfWin *window, const char *const command, gchar **args)
if (!chatwin) {
chatwin = ui_ev_new_chat_win(barejid);
}
ui_ev_focus_win((ProfWin*)chatwin);
ui_switch_win((ProfWin*)chatwin);
if (chatwin->pgp_send) {
ui_current_print_formatted_line('!', 0, "You must disable PGP encryption before starting an OTR session.");