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

Return new window on new chat win event

Browse Source
This commit is contained in:
James Booth
2015-04-29 22:10:32 +01:00
parent 8de308c96a
commit 0df8b8beff
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/command/commands.c
View File

@@ -1332,11 +1332,10 @@ cmd_msg(gchar **args, struct cmd_help_t help)
return TRUE;
} else {
ProfWin *window = (ProfWin*)wins_get_chat(barejid);
if (window) {
ui_ev_focus_win(window);
} else {
ui_ev_new_chat_win(barejid);
if (!window) {
window = ui_ev_new_chat_win(barejid);
}
ui_ev_focus_win(window);
#ifdef HAVE_LIBOTR
if (otr_is_secure(barejid)) {
@@ -4171,11 +4170,10 @@ cmd_otr(gchar **args, struct cmd_help_t help)
}
ProfWin *window = (ProfWin*)wins_get_chat(barejid);
if (window) {
ui_ev_focus_win(window);
} else {
ui_ev_new_chat_win(barejid);
if (!window) {
window = ui_ev_new_chat_win(barejid);
}
ui_ev_focus_win(window);
if (ui_current_win_is_otr()) {
ui_current_print_formatted_line('!', 0, "You are already in an OTR session.");