diff options
author | James Booth <boothj5@gmail.com> | 2015-06-02 20:32:15 +0100 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2015-06-02 20:32:15 +0100 |
commit | 78a4446023660b94ad0d93f59aab3149c50b3868 (patch) | |
tree | d6187e4114ffe229fb71d976b1dd076fb75285b3 /src/ui | |
parent | f278e0a466c3b7815f0575d37057397666218b28 (diff) | |
parent | f0f3a739f4f6963d9ed3300f4b9ef8116ec39ba3 (diff) | |
download | profani-tty-78a4446023660b94ad0d93f59aab3149c50b3868.tar.gz |
Merge branch 'master' into stabber-tests
Diffstat (limited to 'src/ui')
-rw-r--r-- | src/ui/console.c | 10 | ||||
-rw-r--r-- | src/ui/core.c | 10 | ||||
-rw-r--r-- | src/ui/ui.h | 3 |
3 files changed, 14 insertions, 9 deletions
diff --git a/src/ui/console.c b/src/ui/console.c index a41ccad6..1fa8b7b1 100644 --- a/src/ui/console.c +++ b/src/ui/console.c @@ -872,6 +872,15 @@ cons_wrap_setting(void) } void +cons_winstidy_setting(void) +{ + if (prefs_get_boolean(PREF_WINS_AUTO_TIDY)) + cons_show("Window Auto Tidy (/winstidy) : ON"); + else + cons_show("Window Auto Tidy (/winstidy) : OFF"); +} + +void cons_presence_setting(void) { if (prefs_get_boolean(PREF_PRESENCE)) @@ -1035,6 +1044,7 @@ cons_show_ui_prefs(void) cons_flash_setting(); cons_splash_setting(); cons_wrap_setting(); + cons_winstidy_setting(); cons_time_setting(); cons_resource_setting(); cons_vercheck_setting(); diff --git a/src/ui/core.c b/src/ui/core.c index e7059ef0..8431371d 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 0ee21be4..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); @@ -305,6 +305,7 @@ void cons_occupants_setting(void); void cons_roster_setting(void); void cons_presence_setting(void); void cons_wrap_setting(void); +void cons_winstidy_setting(void); void cons_time_setting(void); void cons_mouse_setting(void); void cons_statuses_setting(void); |