X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcommon%2Fdirs.cpp;h=63232c087c572a86685411918c28b86f02242be2;hb=176323555ae58da5fec1ac843e0c613a0b9dabba;hp=8a34b19b8d6e69ab0cb5229a738852bd20146074;hpb=c7879876fbfc4405946aea156f115ce096615858;p=xestiaab%2F.git diff --git a/source/common/dirs.cpp b/source/common/dirs.cpp index 8a34b19..63232c0 100644 --- a/source/common/dirs.cpp +++ b/source/common/dirs.cpp @@ -168,6 +168,57 @@ wxString GetAccountDir(wxString AccName, bool ServerCert) } +std::string GetAccountDir(std::string AccName, bool ServerCert) +{ + + // Get the account directory. + + std::string AccountDir; + +#if defined(__HAIKU__) + +#elif defined(__WIN32__) + + AccountDir.clear(); + AccountDir.append(getenv("APPDATA")); + AccountDir.append("\\Xestia\\Address Book\\accounts\\"); + AccountDir.append(AccName); + AccountDir.append("\\"); + + if (ServerCert == true){ + AccountDir.append("server.crt"); + } + +#elif defined(__APPLE__) + + AccountDir.clear(); + AccountDir.append(getenv("HOME")); + AccountDir.append("/Library/Preferences/Xestia/Address Book/accounts/"); + AccountDir.append(AccName); + AccountDir.append("/"); + + if (ServerCert == true){ + AccountDir.append("server.crt"); + } + +#else + + AccountDir.clear(); + AccountDir.append(getenv("HOME")); + AccountDir.append("/.xestiaab/accounts/"); + AccountDir.append(AccName); + AccountDir.append("/"); + + if (ServerCert == true){ + AccountDir.append("server.crt"); + } + +#endif + + return AccountDir; + +} + wxString GetAccountsFile() { @@ -183,7 +234,7 @@ wxString GetAccountsFile() AccountsFile.Append(wxString::FromUTF8(getenv("APPDATA"))); AccountsFile.Append(wxT("\\Xestia\\Address Book\\preferences\\accounts")); -#elif defined(__WIN32__) +#elif defined(__APPLE__) AccountsFile.Clear(); AccountsFile.Append(wxString::FromUTF8(getenv("HOME")));