X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FfrmMain.h;h=744bf32b8881fa6ffe7b2eec4ef58a6ef78dc102;hb=700c6a4c98319bc09eeb5c0905a5dafac8aa61cc;hp=1c9cddc91d40f5c54df1571ccab49c492ad95fd2;hpb=93e56b6b6222c68d1fba49974b564f362a08d1bd;p=xestiaab%2F.git diff --git a/source/frmMain.h b/source/frmMain.h index 1c9cddc..744bf32 100644 --- a/source/frmMain.h +++ b/source/frmMain.h @@ -75,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); @@ -130,9 +131,9 @@ class frmMain : public frmMainADT #if defined(__APPLE__) std::map AccountTrustData; #elif defined(__WIN32__) - std::map AccountCertificateData; + std::map AccountCertificateData; #else - std::map AccountSSLData; + std::map AccountSSLData; #endif std::map AccountSSLResult; std::multimap AccountGroupList; @@ -171,6 +172,7 @@ class frmMain : public frmMainADT int AccountID; int AccountNetID; int AccountGrpID; + int AccountUnsupportedID; int AccountNoneID; bool ReloadAccounts = FALSE; bool AscendingMode = FALSE; @@ -253,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 ); @@ -279,9 +282,9 @@ class frmMain : public frmMainADT #if defined(__APPLE__) void UpdateSSLAccountStatus(int AccountID, int SSLStatus, SecTrustRef SecurityTrustObject); #elif defined(__WIN32__) - void UpdateSSLAccountStatus(int AccountID, int SSLStatus, CERT_CONTEXT CertificateContext); + void UpdateSSLAccountStatus(int AccountID, int SSLStatus, PCCERT_CONTEXT CertificateContext); #else - void UpdateSSLAccountStatus(int AccountID, int SSLStatus, SSLCertCollection SSLCertInc); + void UpdateSSLAccountStatus(int AccountID, int SSLStatus, SSLCertCollectionString SSLCertInc); #endif DECLARE_EVENT_TABLE()