Merge branch 'master' into refactor2

Conflicts:
	src/ui/core.c

src/ui/console.c

@@ -790,6 +790,9 @@ cons_show_account(ProfAccount *account)
         cons_show   ("enabled        : FALSE");
     }
     cons_show       ("jid            : %s", account->jid);
+    if (account->password != NULL) {
+        cons_show       ("password       : [redacted]");
+    }
     if (account->resource != NULL) {
         cons_show   ("resource       : %s", account->resource);
     }
@@ -936,6 +939,15 @@ cons_splash_setting(void)
         cons_show("Splash screen (/splash)      : OFF");
 }
 
+void
+cons_autoconnect_setting(void)
+{
+    if (prefs_get_string(PREF_CONNECT_ACCOUNT) != NULL)
+        cons_show("Autoconnect (/autoconnect)      : %s", prefs_get_string(PREF_CONNECT_ACCOUNT));
+    else
+        cons_show("Autoconnect (/autoconnect)      : OFF");
+}
+
 void
 cons_vercheck_setting(void)
 {
@@ -1212,6 +1224,7 @@ cons_show_connection_prefs(void)
     cons_show("");
     cons_reconnect_setting();
     cons_autoping_setting();
+    cons_autoconnect_setting();
 
     wins_refresh_console();
     cons_alert();

src/ui/core.c

@@ -847,8 +847,8 @@ ui_new_chat_win(const char * const to)
 
         if (contact != NULL) {
             if (strcmp(p_contact_presence(contact), "offline") == 0) {
-                const char const *show = p_contact_presence(contact);
-                const char const *status = p_contact_status(contact);
+                const char * const show = p_contact_presence(contact);
+                const char * const status = p_contact_status(contact);
                 win_show_status_string(window, to, show, status, NULL, "--", "offline");
             }
         }

src/ui/inputwin.c

@@ -35,6 +35,7 @@
 
 #include "command/command.h"
 #include "common.h"
+#include "config/accounts.h"
 #include "config/preferences.h"
 #include "config/theme.h"
 #include "log.h"
@@ -207,7 +208,7 @@ inp_get_password(char *passwd)
     _clear_input();
     _inp_win_refresh();
     noecho();
-    mvwgetnstr(inp_win, 0, 1, passwd, 20);
+    mvwgetnstr(inp_win, 0, 1, passwd, MAX_PASSWORD_SIZE);
     wmove(inp_win, 0, 0);
     echo();
     status_bar_clear();

src/ui/ui.h

@@ -216,6 +216,7 @@ void cons_autoaway_setting(void);
 void cons_reconnect_setting(void);
 void cons_autoping_setting(void);
 void cons_priority_setting(void);
+void cons_autoconnect_setting(void);
 
 // status bar actions
 void status_bar_refresh(void);