X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FfrmMain.h;h=1c9cddc91d40f5c54df1571ccab49c492ad95fd2;hb=93e56b6b6222c68d1fba49974b564f362a08d1bd;hp=7c8c6258cf337c34071523120d997825856a24ee;hpb=a73019906500e3a0fc306a61e4b7975f79725866;p=xestiaab%2F.git

diff --git a/source/frmMain.h b/source/frmMain.h
index 7c8c625..1c9cddc 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"
@@ -74,6 +81,10 @@ 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 +127,13 @@ class frmMain : public frmMainADT
 		std::map<wxString, bool> WindowList;
 		std::map<int, wxTimer> AccountRefreshList;
 		std::map<int, wxString> AccountAccDirList;
+#if defined(__APPLE__)
+		std::map<int, SecTrustRef> AccountTrustData;
+#elif defined(__WIN32__)
+		std::map<int, CERT_CONTEXT> AccountCertificateData;
+#else
 		std::map<int, SSLCertCollection> AccountSSLData;
+#endif
 		std::map<int, int> AccountSSLResult;
 		std::multimap<int, int> AccountGroupList;
 		std::multimap<int, wxString> AccountGroupFilename;
@@ -177,6 +194,11 @@ class frmMain : public frmMainADT
 		int ContactEditorUID = 0;
 		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 );
@@ -206,7 +228,6 @@ class frmMain : public frmMainADT
 		void RevealContact( wxCommandEvent& event );
 		void RemoveContactsWindowPointer(wxCommandEvent& event);
 		void RemoveContactEditorWindowPointer(wxCommandEvent& event);
-		void UpdateWindowList(wxCommandEvent& event);
 		void RemoveContactSearchWindows(wxCommandEvent& event);
 		void DeleteContact(wxCommandEvent& event);
 		void EmptyServerDialog(wxCommandEvent& event);
@@ -251,11 +272,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, CERT_CONTEXT CertificateContext);
+#else
+		void UpdateSSLAccountStatus(int AccountID, int SSLStatus, SSLCertCollection SSLCertInc);
+#endif
 		DECLARE_EVENT_TABLE()
 
 	//// end generated class members