about summary refs log tree commit diff stats
path: root/src/ui/console.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui/console.c')
-rw-r--r--src/ui/console.c33
1 files changed, 14 insertions, 19 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();