X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;ds=inline;f=source%2FfrmNewAccount.cpp;h=211fb89fc96634da62b3393bfe0d4bd0084036f8;hb=be85301ffda484bcfc0c0576f467a6f56f2f2bb6;hp=55acf26810acdffba50478caa0b2dd8d21a90f7c;hpb=d325b3531e0ee71196f882896f3d5bc91de909c0;p=xestiaab%2F.git
diff --git a/source/frmNewAccount.cpp b/source/frmNewAccount.cpp
index 55acf26..211fb89 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);
@@ -350,7 +369,8 @@ void frmNewAccount::ProcessNext( wxCommandEvent& event )
#elif defined(__WIN32__)
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;
@@ -430,13 +450,14 @@ void frmNewAccount::ProcessNext( wxCommandEvent& event )
delete cfgfile;
cfgfile = NULL;
- ReloadAccountConfig = TRUE;
+ *ReloadAccountConfig = TRUE;
#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;
@@ -515,7 +536,7 @@ void frmNewAccount::ProcessNext( wxCommandEvent& event )
delete cfgfile;
cfgfile = NULL;
- ReloadAccountConfig = TRUE;
+ *ReloadAccountConfig = TRUE;
#endif
@@ -552,7 +573,7 @@ void frmNewAccount::WriteAccountDetails(wxFileConfig *cfgfilein, wxString Accoun
void frmNewAccount::CloseWindow( wxCommandEvent& event )
{
- ReloadAccountConfig = FALSE;
+ *ReloadAccountConfig = FALSE;
this->Close();
}