X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FfrmMain.h;h=24f4032312a0bc00f3651e9176cc9f0e108e9c25;hb=9b00feaa475fa3bca08336bc26050256da8807f3;hp=8d3c58df3317630afecdc00a4686cb389ad49678;hpb=e6cd13ea863b88fbb7140e57ab8d3dc31ac9b1b7;p=xestiaab%2F.git diff --git a/source/frmMain.h b/source/frmMain.h index 8d3c58d..24f4032 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); @@ -132,7 +133,7 @@ class frmMain : public frmMainADT #elif defined(__WIN32__) std::map AccountCertificateData; #else - std::map AccountSSLData; + std::map AccountSSLData; #endif std::map AccountSSLResult; std::multimap AccountGroupList; @@ -189,6 +190,12 @@ class frmMain : public frmMainADT wxBitmap *imgSSLWarning = NULL; wxBitmap *imgOnline = NULL; wxBitmap *imgOffline = NULL; + wxBitmap *imgAddAddressBook = NULL; + wxBitmap *imgPreferences = NULL; + wxBitmap *imgSearchContacts = NULL; + wxBitmap *imgAddContact = NULL; + wxBitmap *imgEditContact = NULL; + wxBitmap *imgDeleteContact = NULL; int ActivityIconStatus = 0; int SearchUID = 0; int ContactUID = 0; @@ -254,6 +261,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 ); @@ -282,7 +290,7 @@ class frmMain : public frmMainADT #elif defined(__WIN32__) 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()