diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/command/command.c | 2 | ||||
-rw-r--r-- | src/command/commands.c | 9 | ||||
-rw-r--r-- | src/ui/core.c | 10 | ||||
-rw-r--r-- | src/ui/ui.h | 2 |
4 files changed, 10 insertions, 13 deletions
diff --git a/src/command/command.c b/src/command/command.c index 25571e81..ea6df2ba 100644 --- a/src/command/command.c +++ b/src/command/command.c @@ -688,7 +688,7 @@ static struct cmd_t command_defs[] = cmd_winstidy, parse_args, 1, 1, &cons_winstidy_setting, { "/winstidy on|off", "Auto tidy windows.", { "/winstidy on|off", - "------------", + "---------------", "Enable or disable auto window tidy.", NULL } } }, diff --git a/src/command/commands.c b/src/command/commands.c index 89ded432..86781330 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -689,7 +689,11 @@ cmd_wins(gchar **args, struct cmd_help_t help) if (args[0] == NULL) { cons_show_wins(); } else if (strcmp(args[0], "tidy") == 0) { - ui_tidy_wins(); + if ( ui_tidy_wins() ) { + cons_show("Windows tidied."); + } else { + cons_show("No tidy needed."); + } } else if (strcmp(args[0], "prune") == 0) { ui_prune_wins(); } else if (strcmp(args[0], "swap") == 0) { @@ -723,8 +727,6 @@ cmd_winstidy(gchar **args, struct cmd_help_t help) { gboolean result = _cmd_set_boolean_preference(args[0], help, "Wins Auto Tidy", PREF_WINS_AUTO_TIDY); - wins_resize_all(); - return result; } @@ -3254,6 +3256,7 @@ cmd_close(gchar **args, struct cmd_help_t help) // Tidy up the window list. if (prefs_get_boolean(PREF_WINS_AUTO_TIDY)) { + // TODO: Any benefit of checking the return value? ui_tidy_wins(); } diff --git a/src/ui/core.c b/src/ui/core.c index e7059ef0..c028e818 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -1105,16 +1105,10 @@ ui_close_win(int index) status_bar_active(1); } -void +gboolean ui_tidy_wins(void) { - gboolean tidied = wins_tidy(); - - if (tidied) { - cons_show("Windows tidied."); - } else { - cons_show("No tidy needed."); - } + return wins_tidy(); } void diff --git a/src/ui/ui.h b/src/ui/ui.h index 8f6a364e..29ee6bef 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -216,7 +216,7 @@ void ui_show_all_room_rosters(void); void ui_hide_all_room_rosters(void); gboolean ui_chat_win_exists(const char * const barejid); -void ui_tidy_wins(void); +gboolean ui_tidy_wins(void); void ui_prune_wins(void); gboolean ui_swap_wins(int source_win, int target_win); |