X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FfrmMain.h;h=6d3e578a0c5bf417925b84c678dfa829a3e19606;hb=ea8011e6a9ca160f5e894d695e21ce1e3b05a146;hp=e3844af805ec0c0cea8135759ae12c9e156bd57a;hpb=53d77f5310765e248097da0c2f7056efd7c67488;p=xestiaab%2F.git diff --git a/source/frmMain.h b/source/frmMain.h index e3844af..6d3e578 100644 --- a/source/frmMain.h +++ b/source/frmMain.h @@ -40,6 +40,8 @@ Subclass of frmMainADT, which is generated by wxFormBuilder. #if defined(__APPLE__) #import #import +#elif defined(__WIN32__) +#include "common/win32ssl.h" #endif #include "common/timers.h" @@ -73,6 +75,7 @@ DECLARE_EVENT_TYPE(WINDOW_EDIT, wxID_ANY); DECLARE_EVENT_TYPE(WINDOW_CLOSE, wxID_ANY); DECLARE_EVENT_TYPE(CONNSTAT_UPDATE, wxID_ANY); DECLARE_EVENT_TYPE(INVALIDSSLCERT, wxID_ANY); +DECLARE_EVENT_TYPE(INVALIDSSLCERTSTRING, wxID_ANY); DECLARE_EVENT_TYPE(GETSELECTEDLIST, wxID_ANY); DECLARE_EVENT_TYPE(SYNCACCOUNT, wxID_ANY); DECLARE_EVENT_TYPE(IMPORT_RESULTSSHOW, wxID_ANY); @@ -127,6 +130,8 @@ class frmMain : public frmMainADT std::map AccountAccDirList; #if defined(__APPLE__) std::map AccountTrustData; +#elif defined(__WIN32__) + std::map AccountCertificateData; #else std::map AccountSSLData; #endif @@ -167,6 +172,7 @@ class frmMain : public frmMainADT int AccountID; int AccountNetID; int AccountGrpID; + int AccountUnsupportedID; int AccountNoneID; bool ReloadAccounts = FALSE; bool AscendingMode = FALSE; @@ -249,6 +255,7 @@ class frmMain : public frmMainADT void UpdateConnectionStatus( wxCommandEvent& event ); void SetupSSLStatus( int AccountID ); void InvalidSSLCertificate( wxCommandEvent& event ); + void InvalidSSLCertificateString( wxCommandEvent& event ); void CheckUpdates( wxCommandEvent& event ); void OpenImportDialog( wxCommandEvent& event ); void OpenExportDialog( wxCommandEvent& event ); @@ -274,6 +281,8 @@ class frmMain : public frmMainADT XABViewMode GetViewMode(); #if defined(__APPLE__) void UpdateSSLAccountStatus(int AccountID, int SSLStatus, SecTrustRef SecurityTrustObject); +#elif defined(__WIN32__) + void UpdateSSLAccountStatus(int AccountID, int SSLStatus, PCCERT_CONTEXT CertificateContext); #else void UpdateSSLAccountStatus(int AccountID, int SSLStatus, SSLCertCollection SSLCertInc); #endif