X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2FfrmNewAccount.h;h=6ef8b0ce85edb62a373526941780d933218c4841;hp=d6f08537ff7518bce41325ccc04c78a3903659a6;hb=f69e09d827e06435ea94bb73aa71ab5f9d5c035b;hpb=c7055c9ac603986b29e34f8641daa1d4a782ca89

diff --git a/source/frmNewAccount.h b/source/frmNewAccount.h
index d6f0853..6ef8b0c 100644
--- a/source/frmNewAccount.h
+++ b/source/frmNewAccount.h
@@ -25,8 +25,15 @@
  */
 
 #include "AppXestiaAddrBk.h"
-#include "carddav/carddav.h"
+#include "carddav2/carddav2.h"
+
+#include "frmInvalidSSLCertificate.h"
+
 #include <wx/fileconf.h>
+#include <string>
+
+DECLARE_EVENT_TYPE(UPDATERESULTS, wxID_ANY);
+DECLARE_EVENT_TYPE(RUNCARDDAV2TEST, wxID_ANY);
 
 //// end generated include
 
@@ -40,21 +47,33 @@ protected:
 	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 RunCardDAV2Test( wxCommandEvent& event );
 #if defined(__APPLE__)
-	int DisplayTrustPanel(CardDAV *Connection);
-	SecTrustResultType ProcessResultType(CardDAV *Connection);
+	int DisplayTrustPanel(ConnectionObject *Connection);
+	SecTrustResultType ProcessResultType(ConnectionObject *Connection);
 #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();
+	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__