X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Factmgr%2FfrmActivityMgr.h;h=fec4778a807352fe84ac15f582a792ce1a79fcd2;hb=ff65774611d82f2bdbb6cb5c34829cc2e922cf68;hp=5ad6eba3d99b6b6177b2853f41ad4f1156f80b46;hpb=a4deb4d72448721584279013bedb6f9c8ceb23ac;p=xestiaab%2F.git

diff --git a/source/actmgr/frmActivityMgr.h b/source/actmgr/frmActivityMgr.h
index 5ad6eba..fec4778 100644
--- a/source/actmgr/frmActivityMgr.h
+++ b/source/actmgr/frmActivityMgr.h
@@ -26,12 +26,23 @@ Subclass of frmActivityMgrADT, which is generated by wxFormBuilder.
 
 #include <map>
 #include <wx/timer.h>
+#if defined(__APPLE__)
+#import <Foundation/Foundation.h>
+#import <SecurityInterface/SFCertificateTrustPanel.h>
+#include "../frmMain.h"
+#endif
 
 #include "../AppXestiaAddrBk.h"
 #include "../carddav/carddav.h"
 #include "../common/timers.h"
 #include "../common/etag.h"
 #include "../common/dirs.h"
+#include "../common/preferences.h"
+#include "../common/sslcertstructs.h"
+
+#if defined(__WIN32__)
+#include "../common/win32ssl.h"
+#endif
 
 //// end generated include
 
@@ -54,6 +65,25 @@ struct ActivityMgrLabelUpdate{
 	wxString ItemDes;
 };
 
+#if defined(__APPLE__)
+struct SSLInvalidTrustNotifObj{
+        SecTrustRef SecurityTrustObject;
+        int *ResultValue;
+        bool *PausePtr;
+        wxString AccountName;
+};
+#endif
+
+struct ActivityMgrAccountSettings{
+	wxString Address;
+	int Port;
+	wxString Username;
+	wxString Password;
+	bool SSL;
+	wxString Prefix;
+	wxString Dir;
+};
+
 /** Implementing frmActivityMgrADT */
 class frmActivityMgr : public frmActivityMgrADT
 {
@@ -70,11 +100,14 @@ class frmActivityMgr : public frmActivityMgrADT
 		std::map<int,int> ActivityListType;
 		std::map<int,long> ActivityListIndex;
 		std::map<int,wxString> ActivityListData;
+		std::map<int,wxString> ActivityListURL;
+		std::map<int,bool> ActivityListEditMode;
 		std::map<int,wxString> ActivityListTaskDetail;
 		std::map<int,wxString> ActivityListAccount;
 		std::map<int,wxString> ActivityListFilename;
 		std::map<int,wxString> ActivityListFullFilename;
 		std::map<int,CardDAV*> ActivityListConn;
+		std::map<int,ActivityMgrAccountSettings> ActivityListAccSettings;
 		std::map<int,wxString> ActivityListETag;
 		std::map<int,wxString> ActivityListETagOriginal;
 		std::map<int,wxDateTime> ActivityListFinDate;
@@ -86,6 +119,9 @@ class frmActivityMgr : public frmActivityMgrADT
 		//int ConflictResult = 0;
 		wxETagProcessTimer *ETagTmrPtr;
 		void *frmMainPtr;
+#if defined(__APPLE__)
+                int DisplayTrustPanel(SecTrustRef SecurityTrustObject, wxString AccountNameFriendly);
+#endif
 		//frmMain *frmMainPtr;
 	protected:
 		// Handlers for frmActivityMgrADT events.