X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FfrmMain.h;h=24f4032312a0bc00f3651e9176cc9f0e108e9c25;hb=c06de7482a3c5d22bf07ca6b3ff5dcfff5b399aa;hp=6ae03eab1b1218b733328f53538e0f0c164e467c;hpb=77b9956953d1e3abb804d6c266c2c64e7b50d9d2;p=xestiaab%2F.git

diff --git a/source/frmMain.h b/source/frmMain.h
index 6ae03ea..24f4032 100644
--- a/source/frmMain.h
+++ b/source/frmMain.h
@@ -37,6 +37,13 @@ Subclass of frmMainADT, which is generated by wxFormBuilder.
 #include <wx/mstream.h>
 #include <wx/tooltip.h>
 
+#if defined(__APPLE__)
+#import <Foundation/Foundation.h>
+#import <SecurityInterface/SFCertificateTrustPanel.h>
+#elif defined(__WIN32__)
+#include "common/win32ssl.h"
+#endif
+
 #include "common/timers.h"
 #include "common/events.h"
 #include "common/etag.h"
@@ -68,12 +75,17 @@ 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);
 DECLARE_EVENT_TYPE(RELOADCONTACTLIST, wxID_ANY);
 DECLARE_EVENT_TYPE(REFRESHADDRESSBOOK, wxID_ANY);
 
+#if defined(__APPLE__)
+DECLARE_EVENT_TYPE(INVALIDSSLTRUST, wxID_ANY);
+#endif
+
 struct UCNotif{
 	wxString ContactAccount;
 	wxString ContactFilename;
@@ -116,7 +128,13 @@ class frmMain : public frmMainADT
 		std::map<wxString, bool> WindowList;
 		std::map<int, wxTimer> AccountRefreshList;
 		std::map<int, wxString> AccountAccDirList;
-		std::map<int, SSLCertCollection> AccountSSLData;
+#if defined(__APPLE__)
+		std::map<int, SecTrustRef> AccountTrustData;
+#elif defined(__WIN32__)
+		std::map<int, PCCERT_CONTEXT> AccountCertificateData;
+#else
+		std::map<int, SSLCertCollectionString> AccountSSLData;
+#endif
 		std::map<int, int> AccountSSLResult;
 		std::multimap<int, int> AccountGroupList;
 		std::multimap<int, wxString> AccountGroupFilename;
@@ -154,6 +172,7 @@ class frmMain : public frmMainADT
 		int AccountID;
 		int AccountNetID;
 		int AccountGrpID;
+		int AccountUnsupportedID;
 		int AccountNoneID;
 		bool ReloadAccounts = FALSE;
 		bool AscendingMode = FALSE;
@@ -171,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;
@@ -178,6 +203,10 @@ class frmMain : public frmMainADT
 		int WindowMenuItemID = 0;
 		XABContactMenu *ContactMenu = new XABContactMenu(XABCONTACTMENU_MAIN); 
 		void ResetContactInfo();
+#if defined(__APPLE__)
+		void DisplayCertificate(SecTrustRef SecurityTrustObject);
+		void DisplayTrustPanel( wxCommandEvent& event );
+#endif
 	protected:
 		// Handlers for frmMainADT events.
 		void QuitApp( wxCloseEvent& event );
@@ -232,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 );
@@ -251,11 +281,17 @@ class frmMain : public frmMainADT
 		void ActivityIconStop( wxCommandEvent& event );
 		void PauseAllTimers();
 		void ResumeAllTimers();
-		void UpdateSSLAccountStatus(int AccountID, int SSLStatus, SSLCertCollection SSLCertInc);
 		void GetListControl(wxListCtrl *lstContactsPtr, wxArrayString *ContactsFileIndexPtr);
 		void ShowImportResults( wxCommandEvent& event );
 		void ReloadContactList( wxCommandEvent& event );
 		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, SSLCertCollectionString SSLCertInc);
+#endif
 		DECLARE_EVENT_TABLE()
 
 	//// end generated class members