1 files changed, 38 insertions, 12 deletions

diff --git a/src/ui/console.c b/src/ui/console.c
index 3d3a5d8b..dd50d6d3 100644
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -638,32 +638,34 @@ cons_show_account(ProfAccount *account)
         cons_show   ("enabled           : FALSE");
     }
     cons_show       ("jid               : %s", account->jid);
-    if (account->password != NULL) {
+    if (account->eval_password) {
+        cons_show   ("eval_password     : %s", account->eval_password);
+    } else if (account->password) {
         cons_show   ("password          : [redacted]");
     }
-    if (account->resource != NULL) {
+    if (account->resource) {
         cons_show   ("resource          : %s", account->resource);
     }
-    if (account->server != NULL) {
+    if (account->server) {
         cons_show   ("server            : %s", account->server);
     }
     if (account->port != 0) {
         cons_show   ("port              : %d", account->port);
     }
-    if (account->muc_service != NULL) {
+    if (account->muc_service) {
         cons_show   ("muc service       : %s", account->muc_service);
     }
-    if (account->muc_nick != NULL) {
+    if (account->muc_nick) {
         cons_show   ("muc nick          : %s", account->muc_nick);
     }
-    if (account->last_presence != NULL) {
+    if (account->last_presence) {
         cons_show   ("Last presence     : %s", account->last_presence);
     }
-    if (account->login_presence != NULL) {
+    if (account->login_presence) {
         cons_show   ("Login presence    : %s", account->login_presence);
     }
 
-    if (account->otr_policy != NULL) {
+    if (account->otr_policy) {
         cons_show   ("OTR policy        : %s", account->otr_policy);
     }
     if (g_list_length(account->otr_manual) > 0) {
@@ -841,6 +843,19 @@ cons_beep_setting(void)
 }
 
 void
+cons_resource_setting(void)
+{
+    if (prefs_get_boolean(PREF_RESOURCE_TITLE))
+        cons_show("Resource title (/resource)    : ON");
+    else
+        cons_show("Resource title (/resource)    : OFF");
+    if (prefs_get_boolean(PREF_RESOURCE_MESSAGE))
+        cons_show("Message title (/resource)     : ON");
+    else
+        cons_show("Message title (/resource)     : OFF");
+}
+
+void
 cons_wrap_setting(void)
 {
     if (prefs_get_boolean(PREF_WRAP))
@@ -951,10 +966,15 @@ cons_statuses_setting(void)
 void
 cons_titlebar_setting(void)
 {
-    if (prefs_get_boolean(PREF_TITLEBAR)) {
-        cons_show("Titlebar display (/titlebar)  : ON");
+    if (prefs_get_boolean(PREF_TITLEBAR_SHOW)) {
+        cons_show("Titlebar show (/titlebar)     : ON");
+    } else {
+        cons_show("Titlebar show (/titlebar)     : OFF");
+    }
+    if (prefs_get_boolean(PREF_TITLEBAR_GOODBYE)) {
+        cons_show("Titlebar goodbye (/titlebar)  : ON");
     } else {
-        cons_show("Titlebar display (/titlebar)  : OFF");
+        cons_show("Titlebar goodbye (/titlebar)  : OFF");
     }
 }
 
@@ -991,6 +1011,7 @@ cons_show_ui_prefs(void)
     cons_splash_setting();
     cons_wrap_setting();
     cons_time_setting();
+    cons_resource_setting();
     cons_vercheck_setting();
     cons_mouse_setting();
     cons_statuses_setting();
@@ -1163,7 +1184,12 @@ cons_show_chat_prefs(void)
 void
 cons_inpblock_setting(void)
 {
-    cons_show("Input block (/inpblock)       : %d milliseconds", prefs_get_inpblock());
+    cons_show("Input timeout (/inpblock)     : %d milliseconds", prefs_get_inpblock());
+    if (prefs_get_boolean(PREF_INPBLOCK_DYNAMIC)) {
+        cons_show("Dynamic timeout (/inpblock)   : ON");
+    } else {
+        cons_show("Dynamic timeout (/inpblock)   : OFF");
+    }
 }
 
 void