devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

Merge branch 'master' into refactor2

Browse Source 
Conflicts:
	src/ui/core.c
This commit is contained in:
James Booth
2013-11-11 20:51:35 +00:00
parent 3e86d108a3 c5f76721ce
commit 8c97658b8d
16 changed files with 139 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/ui/console.c
View File

@@ -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();