X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FfrmNewAccount.cpp;h=e3202234695699a425e5154626cc923d2de76078;hb=072925fb1ad8123b6739fdfdaaf490bc8611f381;hp=3df77811aa338c3fed2302d9621b35e66506ce77;hpb=c5bc76b6a1301ce594a0949f02855a6bc2190094;p=xestiaab%2F.git
diff --git a/source/frmNewAccount.cpp b/source/frmNewAccount.cpp
index 3df7781..e320223 100644
--- a/source/frmNewAccount.cpp
+++ b/source/frmNewAccount.cpp
@@ -1,3 +1,21 @@
+// frmNewAccount.cpp - New Account form.
+//
+// (c) 2012-2015 Xestia Software Development.
+//
+// This file is part of Xestia Address Book.
+//
+// Xestia Address Book is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by the
+// Free Software Foundation, version 3 of the license.
+//
+// Xestia Address Book is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with Xestia Address Book. If not, see
+
#include "frmNewAccount.h"
#include
#include
@@ -338,6 +356,7 @@ void frmNewAccount::ProcessNext( wxCommandEvent& event )
// Finished.
wxString XestiaABPrefDirectory;
+ wxString XestiaABDirectory;
wxString AccountSettingsFile;
//wxFile ASFile;
wxString RandomNumberSuffix = wxString::Format(wxT("%i"), rand() % 32767);
@@ -349,8 +368,9 @@ void frmNewAccount::ProcessNext( wxCommandEvent& event )
#elif defined(__WIN32__)
- XestiaABPrefDirectory = GetUserDir();
-
+ XestiaABPrefDirectory = GetUserPrefDir();
+ XestiaABDirectory = GetUserDir();
+
AccountSettingsFile = XestiaABPrefDirectory + wxT("accounts");
// Open the file for writing.
@@ -385,7 +405,7 @@ void frmNewAccount::ProcessNext( wxCommandEvent& event )
wxString DirectoryName = txtAccountName->GetValue().Mid(0, 30) + RandomNumberSuffix;
- if (wxMkdir(XestiaABPrefDirectory + wxT("/accounts/") + DirectoryName + wxT(".carddav"), 0740) == TRUE){
+ if (wxMkdir(XestiaABDirectory + wxT("\\accounts\\") + DirectoryName + wxT(".carddav"), 0740) == TRUE){
DirectoryCreated = TRUE;
@@ -408,7 +428,7 @@ void frmNewAccount::ProcessNext( wxCommandEvent& event )
wxString DirectoryName = txtAccountName->GetValue().Mid(0, 30) + RandomNumberSuffix;
- if (wxMkdir(XestiaABPrefDirectory + wxT("/accounts/") + DirectoryName + wxT(".local"), 0740) == TRUE){
+ if (wxMkdir(XestiaABDirectory + wxT("\\accounts\\") + DirectoryName + wxT(".local"), 0740) == TRUE){
DirectoryCreated = TRUE;
@@ -434,9 +454,10 @@ void frmNewAccount::ProcessNext( wxCommandEvent& event )
#else
- XestiaABPrefDirectory = GetUserDir();
+ XestiaABPrefDirectory = GetUserPrefDir();
+ XestiaABDirectory = GetUserDir();
- AccountSettingsFile = GetUserPrefDir() + wxT("accounts");
+ AccountSettingsFile = XestiaABPrefDirectory + wxT("accounts");
// Open the file for writing.
@@ -470,7 +491,7 @@ void frmNewAccount::ProcessNext( wxCommandEvent& event )
wxString DirectoryName = txtAccountName->GetValue().Mid(0, 30) + RandomNumberSuffix;
- if (wxMkdir(XestiaABPrefDirectory + wxT("/accounts/") + DirectoryName + wxT(".carddav"), 0740) == TRUE){
+ if (wxMkdir(XestiaABDirectory + wxT("/accounts/") + DirectoryName + wxT(".carddav"), 0740) == TRUE){
DirectoryCreated = TRUE;
@@ -493,7 +514,7 @@ void frmNewAccount::ProcessNext( wxCommandEvent& event )
wxString DirectoryName = txtAccountName->GetValue().Mid(0, 30) + RandomNumberSuffix;
- if (wxMkdir(XestiaABPrefDirectory + wxT("/accounts/") + DirectoryName + wxT(".local"), 0740) == TRUE){
+ if (wxMkdir(XestiaABDirectory + wxT("/accounts/") + DirectoryName + wxT(".local"), 0740) == TRUE){
DirectoryCreated = TRUE;