Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiaab
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
frmContactEditorSound: Implemented priority control
[xestiaab/.git]
/
source
/
frmNewAccount.h
diff --git
a/source/frmNewAccount.h
b/source/frmNewAccount.h
index
d6f0853
..
6ef8b0c
100644
(file)
--- a/
source/frmNewAccount.h
+++ b/
source/frmNewAccount.h
@@
-25,8
+25,15
@@
*/
#include "AppXestiaAddrBk.h"
*/
#include "AppXestiaAddrBk.h"
-#include "carddav/carddav.h"
+#include "carddav2/carddav2.h"
+
+#include "frmInvalidSSLCertificate.h"
+
#include <wx/fileconf.h>
#include <wx/fileconf.h>
+#include <string>
+
+DECLARE_EVENT_TYPE(UPDATERESULTS, wxID_ANY);
+DECLARE_EVENT_TYPE(RUNCARDDAV2TEST, wxID_ANY);
//// end generated include
//// end generated include
@@
-40,21
+47,33
@@
protected:
void ProcessNext( wxCommandEvent& event );
void CloseWindow( wxCommandEvent& event );
void UpdateRequirements( wxCommandEvent& event );
void ProcessNext( wxCommandEvent& event );
void CloseWindow( wxCommandEvent& event );
void UpdateRequirements( wxCommandEvent& event );
+ void UpdateResults( wxCommandEvent& event );
void WriteAccountDetails( wxFileConfig *cfgfilein, wxString AccountType, wxString DirectoryName );
void WriteAccountDetails( wxFileConfig *cfgfilein, wxString AccountType, wxString DirectoryName );
+ void RunCardDAV2Test( wxCommandEvent& event );
#if defined(__APPLE__)
#if defined(__APPLE__)
- int DisplayTrustPanel(C
ardDAV
*Connection);
- SecTrustResultType ProcessResultType(C
ardDAV
*Connection);
+ int DisplayTrustPanel(C
onnectionObject
*Connection);
+ SecTrustResultType ProcessResultType(C
onnectionObject
*Connection);
#endif
public:
/** Constructor */
frmNewAccount( wxWindow* parent );
void SetupPointers(bool *ReloadAccountInc);
#endif
public:
/** Constructor */
frmNewAccount( wxWindow* parent );
void SetupPointers(bool *ReloadAccountInc);
+ DECLARE_EVENT_TABLE()
//// end generated class members
private:
int PageSeek = 0;
wxString ServerPrefix;
bool *ReloadAccountConfig = NULL;
void SetErrorMessageLabel();
//// end generated class members
private:
int PageSeek = 0;
wxString ServerPrefix;
bool *ReloadAccountConfig = NULL;
void SetErrorMessageLabel();
+ struct NewAccountResult{
+ bool Connected = false;
+ bool SSLStatus = false;
+ COSSLVerified SSLVerified = COSSL_NORESULT;
+ bool ValidResponse = false;
+ bool AuthPassed = false;
+ bool CanProcess = false;
+ std::string ErrorMessage = "";
+ };
};
#endif // __frmNewAccount__
};
#endif // __frmNewAccount__
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy