X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcommon%2Fpreferences.cpp;h=009afea777e65d7e77d743114bf90147e2feb76d;hb=176323555ae58da5fec1ac843e0c613a0b9dabba;hp=0a739e5f47b38ac016a655370bfe97d25eee8929;hpb=73418d4e12f279e021976f4d26c8234ec8e7cba6;p=xestiaab%2F.git diff --git a/source/common/preferences.cpp b/source/common/preferences.cpp index 0a739e5..009afea 100644 --- a/source/common/preferences.cpp +++ b/source/common/preferences.cpp @@ -169,6 +169,9 @@ XABPreferences::XABPreferences(wxString PreferencesFilename){ if (AccSSLInc == wxT("true")){ AccSSL = TRUE; } + else { + AccSSL = FALSE; + } accountusernamevalid = cfgfile->Read(wxT("username"), &AccUsr); accountpasswordvalid = cfgfile->Read(wxT("password"), &AccPass); accountdirprefixvalid = cfgfile->Read(wxT("prefix"), &AccPrefix); @@ -192,6 +195,41 @@ XABPreferences::XABPreferences(wxString PreferencesFilename){ AccSSL, AccUsr, AccPass, AccPrefix, AccDir, AccRef); + } else { + + cfgfile->Read(wxT("accountdir"), &AccDir); + accountaddressvalid = cfgfile->Read(wxT("address"), &AccAdr); + accountportvalid = cfgfile->Read(wxT("port"), &AccPort); + accountsslvalid = cfgfile->Read(wxT("ssl"), &AccSSLInc); + if (AccSSLInc == wxT("true")){ + AccSSL = TRUE; + } + else { + AccSSL = FALSE; + } + accountusernamevalid = cfgfile->Read(wxT("username"), &AccUsr); + accountpasswordvalid = cfgfile->Read(wxT("password"), &AccPass); + accountdirprefixvalid = cfgfile->Read(wxT("prefix"), &AccPrefix); + accountrefreshvalid = cfgfile->Read(wxT("refresh"), &AccRef); + + if (AccDir.Len() > 4){ + + accountdirvalid = TRUE; + + } + + // Make sure it is not bigger than 65535 or less than 1. + // If so, default to port 8008. + + if (accountport < 1 || accountport > 65535){ + accountport = 8008; + accountportvalid = TRUE; + } + + accounts.AddAccount(accountname, EntryValue, AccAdr, AccPort, + AccSSL, AccUsr, AccPass, + AccPrefix, AccDir, AccRef); + } // Clear up for the next account.