diff --git a/options/default.xml b/options/default.xml
index 90f019b3..ef33997b 100644
--- a/options/default.xml
+++ b/options/default.xml
@@ -19,7 +19,7 @@
- true
+ false
false
@@ -86,7 +86,7 @@
true
- false
+ true
true
@@ -128,7 +128,7 @@
auto
- 5
+ 10
@@ -146,8 +146,8 @@
false
100
- true
- false
+ false
+ true
@@ -208,7 +208,7 @@ QLineEdit#le_status_text {
false
false
true
- true
+ false
status
false
true
@@ -223,7 +223,7 @@ QLineEdit#le_status_text {
true
true
true
- true
+ false
true
true
@@ -248,7 +248,7 @@ QLineEdit#le_status_text {
false
false
true
- false
+ true
true
64
@@ -285,7 +285,7 @@ QLineEdit#le_status_text {
true
- true
+ false
true
@@ -335,7 +335,7 @@ QLineEdit#le_status_text {
true
false
- true
+ false
false
true
@@ -353,8 +353,8 @@ QLineEdit#le_status_text {
- #f0f0f0
- #5a5a5a
+ #00007f
+ #969696
#969696
@@ -364,16 +364,16 @@ QLineEdit#le_status_text {
#004bb4
#7e0000
#646464
-
+ #ffffff
- #000000
+ #6f0000
#969696
#808080
true
#e9ecc7
- #000000
+ #ffffff
@@ -384,21 +384,21 @@ QLineEdit#le_status_text {
- Red
#910000
- #00008a
+ #00aaff
#336600
- black
+ #cccccc
- #0000ff
+ #0055ff
#ff0000
#008000
#606060
#FF0000
- #000080
+ #55ffff
#400080
- darkGreen
+ #cccccc
red
grey
@@ -411,10 +411,10 @@ QLineEdit#le_status_text {
false
- Sans Serif,11,-1,5,50,0,0,0,0,0
- Sans Serif,11,-1,5,50,0,0,0,0,0
- Sans Serif,11,-1,5,50,0,0,0,0,0
- Sans Serif,9,-1,5,50,0,0,0,0,0
+ Monospace,12,-1,5,50,0,0,0,0,0
+ Monospace,12,-1,5,50,0,0,0,0,0
+ Monospace,12,-1,5,50,0,0,0,0,0
+ Monospace,12,-1,5,50,0,0,0,0,0
@@ -462,20 +462,20 @@ QLineEdit#le_status_text {
false
- sound/chat2.wav
- sound/chat2.wav
- sound/ft_complete.wav
- sound/offline.wav
- sound/online.wav
- true
- sound/ft_incoming.wav
- sound/chat2.wav
- sound/chat2.wav
- sound/chat1.wav
+
+
+
+
+
+ false
+
+
+
+
false
- sound/send.wav
- false
- sound/chat2.wav
+
+ true
+
false
@@ -494,7 +494,7 @@ QLineEdit#le_status_text {
close
detach
- CM
+ ACM
true
@@ -627,7 +627,7 @@ QLineEdit#le_status_text {
true
- false
+ true
false
true
true
@@ -650,7 +650,20 @@ QLineEdit#le_status_text {
true
false
-
+
+
+ zone
+ false
+ dnd
+ In The Zone[TM]
+
+
+ sleep
+ false
+ offline
+ Sleeping the hell out of here.
+
+
submenu
false
true
@@ -690,5 +703,9 @@ QLineEdit#le_status_text {
-
+
+
+ true
+
+
diff --git a/src/psi_profiles.cpp b/src/psi_profiles.cpp
index 77fbd169..4b4bca11 100644
--- a/src/psi_profiles.cpp
+++ b/src/psi_profiles.cpp
@@ -79,8 +79,8 @@ void UserAccount::reset()
req_mutual_auth = false;
legacy_ssl_probe = false;
security_level = QCA::SL_None;
- ssl = SSL_Auto;
- jid = "";
+ ssl = SSL_Yes;
+ jid = "@jid@";
pass = "";
scramSaltedHashPassword = "";
opt_pass = false;
@@ -90,7 +90,7 @@ void UserAccount::reset()
opt_automatic_resource = true;
priority_dep_on_status = true;
ignore_global_actions = false;
- resource = ApplicationInfo::name();
+ resource = "@resource@";
priority = 55;
ibbOnly = false;
opt_keepAlive = true;
@@ -133,7 +133,7 @@ void UserAccount::reset()
<< "stun.voipbuster.com"
<< "stun.voxgratia.org";
- stunHost = stunHosts[0];
+ stunHost = "";
keybind.clear();