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-21 23:35:37 +01:00
parent ebca38e224 88739d5c59
commit bc445ccdfb
9 changed files with 105 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/command/commands.c
View File

@@ -749,7 +749,7 @@ gboolean
cmd_win(gchar **args, struct cmd_help_t help)
{
int num = atoi(args[0]);
gboolean switched = ui_switch_win(num);
gboolean switched = ui_switch_win_num(num);
if (switched == FALSE) {
cons_show("Window %d does not exist.", num);
}
@@ -1358,7 +1358,13 @@ cmd_msg(gchar **args, struct cmd_help_t help)
client_send_msg(barejid, msg);
return TRUE;
} else {
ui_new_chat_win(barejid);
ProfWin *window = (ProfWin*)wins_get_chat(barejid);
if (window) {
client_focus_win(window);
} else {
client_new_chat_win(barejid);
}
#ifdef HAVE_LIBOTR
if (otr_is_secure(barejid)) {
ui_gone_secure(barejid, otr_is_trusted(barejid));
@@ -2478,7 +2484,7 @@ cmd_form(gchar **args, struct cmd_help_t help)
current = wins_get_console();
}
int num = wins_get_num(current);
ui_switch_win(num);
ui_switch_win_num(num);
}
return TRUE;
@@ -2786,7 +2792,7 @@ cmd_room(gchar **args, struct cmd_help_t help)
if (confwin != NULL) {
num = wins_get_num(window);
ui_switch_win(num);
ui_switch_win_num(num);
} else {
iq_request_room_config_form(mucwin->roomjid);
}
@@ -4246,7 +4252,12 @@ cmd_otr(gchar **args, struct cmd_help_t help)
barejid = contact;
}
ui_new_chat_win(barejid);
ProfWin *window = (ProfWin*)wins_get_chat(barejid);
if (window) {
client_focus_win(window);
} else {
client_new_chat_win(barejid);
}
if (ui_current_win_is_otr()) {
ui_current_print_formatted_line('!', 0, "You are already in an OTR session.");