aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-02-02 15:08:15 -05:00
Code

Refactored 'ui_tidy_wins()' to return bool and not output text, Corrected underline, removed call to function 'wins_resize_all()'.

Browse Source
This commit is contained in:
Pete 2015-06-01 11:27:01 +01:00
parent 9c659246bc
commit 0564976264
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/command/command.c
View File

@ -688,7 +688,7 @@ static struct cmd_t command_defs[] =
cmd_winstidy, parse_args, 1, 1, &cons_winstidy_setting, cmd_winstidy, parse_args, 1, 1, &cons_winstidy_setting,
{ "/winstidy on|off", "Auto tidy windows.", { "/winstidy on|off", "Auto tidy windows.",
{ "/winstidy on|off", { "/winstidy on|off",
"------------", "---------------",
"Enable or disable auto window tidy.", "Enable or disable auto window tidy.",
NULL } } }, NULL } } },

9
src/command/commands.c
View File

@ -689,7 +689,11 @@ cmd_wins(gchar **args, struct cmd_help_t help)
if (args[0] == NULL) { if (args[0] == NULL) {
cons_show_wins(); cons_show_wins();
} else if (strcmp(args[0], "tidy") == 0) { } 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) { } else if (strcmp(args[0], "prune") == 0) {
ui_prune_wins(); ui_prune_wins();
} else if (strcmp(args[0], "swap") == 0) { } 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); gboolean result = _cmd_set_boolean_preference(args[0], help, "Wins Auto Tidy", PREF_WINS_AUTO_TIDY);
wins_resize_all();
return result; return result;
} }
@ -3254,6 +3256,7 @@ cmd_close(gchar **args, struct cmd_help_t help)
// Tidy up the window list. // Tidy up the window list.
if (prefs_get_boolean(PREF_WINS_AUTO_TIDY)) { if (prefs_get_boolean(PREF_WINS_AUTO_TIDY)) {
// TODO: Any benefit of checking the return value?
ui_tidy_wins(); ui_tidy_wins();
} }

10
src/ui/core.c
View File

@ -1105,16 +1105,10 @@ ui_close_win(int index)
status_bar_active(1); status_bar_active(1);
} }
void gboolean
ui_tidy_wins(void) ui_tidy_wins(void)
{ {
gboolean tidied = wins_tidy(); return wins_tidy();
if (tidied) {
cons_show("Windows tidied.");
} else {
cons_show("No tidy needed.");
}
} }
void void

2
src/ui/ui.h
View File

@ -216,7 +216,7 @@ void ui_show_all_room_rosters(void);
void ui_hide_all_room_rosters(void); void ui_hide_all_room_rosters(void);
gboolean ui_chat_win_exists(const char * const barejid); gboolean ui_chat_win_exists(const char * const barejid);
void ui_tidy_wins(void); gboolean ui_tidy_wins(void);
void ui_prune_wins(void); void ui_prune_wins(void);
gboolean ui_swap_wins(int source_win, int target_win); gboolean ui_swap_wins(int source_win, int target_win);

5
tests/ui/stub_ui.c
View File

@ -315,7 +315,10 @@ void ui_redraw_all_room_rosters(void) {}
void ui_show_all_room_rosters(void) {} void ui_show_all_room_rosters(void) {}
void ui_hide_all_room_rosters(void) {} void ui_hide_all_room_rosters(void) {}
void ui_tidy_wins(void) {} gboolean ui_tidy_wins(void) {
// TODO: I'm assuming it should return true, but lack knowledge about the tests.
return TRUE;
}
void ui_prune_wins(void) {} void ui_prune_wins(void) {}
gboolean ui_swap_wins(int source_win, int target_win) gboolean ui_swap_wins(int source_win, int target_win)
{ {