devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-19 12:36:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed ui_win_switch_num

Browse Source
This commit is contained in:
James Booth
2015-04-30 22:09:39 +01:00
parent 20555fcb36
commit d68fb25dde
10 changed files with 81 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/command/commands.c
View File

@@ -722,10 +722,16 @@ gboolean
cmd_win(gchar **args, struct cmd_help_t help)
{
int num = atoi(args[0]);
gboolean switched = ui_switch_win_num(num);
if (switched == FALSE) {
ProfWin *window = wins_get_by_num(num);
if (!window) {
cons_show("Window %d does not exist.", num);
} else {
if (!wins_is_current(window)) {
ui_ev_focus_win(window);
}
}
return TRUE;
}
@@ -2453,12 +2459,11 @@ cmd_form(gchar **args, struct cmd_help_t help)
cmd_autocomplete_remove_form_fields(confwin->form);
}
wins_close_current();
ProfWin *current = (ProfWin*)wins_get_muc(confwin->roomjid);
if (current == NULL) {
current = wins_get_console();
ProfWin *new_current = (ProfWin*)wins_get_muc(confwin->roomjid);
if (!new_current) {
new_current = wins_get_console();
}
int num = wins_get_num(current);
ui_switch_win_num(num);
ui_ev_focus_win(new_current);
}
return TRUE;
@@ -2764,9 +2769,8 @@ cmd_room(gchar **args, struct cmd_help_t help)
if (g_strcmp0(args[0], "config") == 0) {
ProfMucConfWin *confwin = wins_get_muc_conf(mucwin->roomjid);
if (confwin != NULL) {
num = wins_get_num(window);
ui_switch_win_num(num);
if (confwin) {
ui_ev_focus_win((ProfWin*)confwin);
} else {
iq_request_room_config_form(mucwin->roomjid);
}