diff options
| author | James Booth <boothj5@gmail.com> | 2016-05-31 23:29:46 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2016-05-31 23:29:46 +0100 |
| commit | 321541829617bce07526af318b7ff017e08eabf0 (patch) | |
| tree | 468567373953c6258ee2f03f3f49c3542f364333 /src/ui | |
| parent | 1d5cc3327961739ac84ca3b9d66fc532bc6773b0 (diff) | |
| parent | e758f74e48d447c622457e614f1f2f36b7ef7944 (diff) | |
| download | profani-tty-321541829617bce07526af318b7ff017e08eabf0.tar.gz | |
Merge branch 'master' into complete-empty
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/console.c | 33 | ||||
| -rw-r--r-- | src/ui/ui.h | 1 |
2 files changed, 14 insertions, 20 deletions
diff --git a/src/ui/console.c b/src/ui/console.c index 207db949..281a68d5 100644 --- a/src/ui/console.c +++ b/src/ui/console.c @@ -1176,9 +1176,21 @@ void cons_presence_setting(void) { if (prefs_get_boolean(PREF_PRESENCE)) - cons_show("Contact presence (/presence) : ON"); + cons_show("Titlebar presence (/presence) : ON"); else - cons_show("Contact presence (/presence) : OFF"); + cons_show("Titlebar presence (/presence) : OFF"); + + char *console = prefs_get_string(PREF_STATUSES_CONSOLE); + char *chat = prefs_get_string(PREF_STATUSES_CHAT); + char *room = prefs_get_string(PREF_STATUSES_MUC); + + cons_show("Console presence (/presence) : %s", console); + cons_show("Chat presence (/presence) : %s", chat); + cons_show("Room presence (/presence) : %s", room); + + prefs_free_string(console); + prefs_free_string(chat); + prefs_free_string(room); } void @@ -1316,22 +1328,6 @@ cons_vercheck_setting(void) } void -cons_statuses_setting(void) -{ - char *console = prefs_get_string(PREF_STATUSES_CONSOLE); - char *chat = prefs_get_string(PREF_STATUSES_CHAT); - char *muc = prefs_get_string(PREF_STATUSES_MUC); - - cons_show("Console statuses (/statuses) : %s", console); - cons_show("Chat statuses (/statuses) : %s", chat); - cons_show("MUC statuses (/statuses) : %s", muc); - - prefs_free_string(console); - prefs_free_string(chat); - prefs_free_string(muc); -} - -void cons_titlebar_setting(void) { if (prefs_get_boolean(PREF_TITLEBAR_SHOW)) { @@ -1532,7 +1528,6 @@ cons_show_ui_prefs(void) cons_time_setting(); cons_resource_setting(); cons_vercheck_setting(); - cons_statuses_setting(); cons_console_setting(); cons_occupants_setting(); cons_roster_setting(); diff --git a/src/ui/ui.h b/src/ui/ui.h index 2213ccc1..c15af910 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -297,7 +297,6 @@ void cons_presence_setting(void); void cons_wrap_setting(void); void cons_winstidy_setting(void); void cons_time_setting(void); -void cons_statuses_setting(void); void cons_titlebar_setting(void); void cons_notify_setting(void); void cons_show_desktop_prefs(void); |